commit/cc-mode: 2 new changesets

2 new commits in cc-mode: https://bitbucket.org/xemacs/cc-mode/commits/3588e63d2bb9/ changeset: 3588e63d2bb9 user: acm date: 2013-03-04 19:30:30 summary: Replace `last-command-event' by `last-command-char' in XEmacs. cc-defs.el (c-last-command-char): New macro. cc-align.el (c-semi&comma-inside-parenlist) (c-semi&comma-no-newlines-before-nonblanks) (c-semi&comma-no-newlines-for-oneline-inliners): Use the new macro in place of `last-command-event'. cc-cmds.el (c-electric-pound, c-electric-brace, c-electric-slash) (c-electric-semi&comma, c-electric-lt-gt, c-electric-paren) (c-electric-continued-statement): Use the new macro in place of `last-command-event'. affected #: 3 files diff -r 46a489fd8658e00feee07abcdf12e8e0c2132994 -r 3588e63d2bb91225166a37e2f90af1230aa0d4fb cc-align.el --- a/cc-align.el +++ b/cc-align.el ＠＠ -1298,7 +1298,7 ＠＠ exactly the old newline insertion behavior." ;; newline only after semicolon, but only if that semicolon is not ;; inside a parenthesis list (e.g. a for loop statement) - (if (not (eq last-command-event ?\;)) + (if (not (eq (c-last-command-char) ?\;)) nil ; continue checking (if (condition-case nil (save-excursion ＠＠ -1315,7 +1315,7 ＠＠ inserted, and the following line is not blank, no newline is inserted. Otherwise, no determination is made." (save-excursion - (if (and (= last-command-event ?\;) + (if (and (= (c-last-command-char) ?\;) ;;(/= (point-max) ;; (save-excursion (skip-syntax-forward " ") (point)) (zerop (forward-line 1)) ＠＠ -1335,7 +1335,7 ＠＠ (if (c-safe (up-list -1) t) (c-point 'bol) -1)))) - (if (and (eq last-command-event ?\;) + (if (and (eq (c-last-command-char) ?\;) (eq (car (car syntax)) 'inclass) (eq (car (car (cdr syntax))) 'topmost-intro) (= (c-point 'bol) bol)) diff -r 46a489fd8658e00feee07abcdf12e8e0c2132994 -r 3588e63d2bb91225166a37e2f90af1230aa0d4fb cc-cmds.el --- a/cc-cmds.el +++ b/cc-cmds.el ＠＠ -477,7 +477,7 ＠＠ (bolp (bolp))) (beginning-of-line) (delete-horizontal-space) - (insert last-command-event) + (insert (c-last-command-char)) (and (not bolp) (goto-char (- (point-max) pos))) ))) ＠＠ -739,7 +739,7 ＠＠ ;; `}': clean up empty defun braces (when (c-save-buffer-state () (and (memq 'empty-defun-braces c-cleanup-list) - (eq last-command-event ?\}) + (eq (c-last-command-char) ?\}) (c-intersect-lists '(defun-close class-close inline-close) syntax) (progn ＠＠ -755,14 +755,14 ＠＠ ;; `}': compact to a one-liner defun? (save-match-data (when - (and (eq last-command-event ?\}) + (and (eq (c-last-command-char) ?\}) (memq 'one-liner-defun c-cleanup-list) (c-intersect-lists '(defun-close) syntax) (c-try-one-liner)) (setq here (- (point-max) pos)))) ;; `{': clean up brace-else-brace and brace-elseif-brace - (when (eq last-command-event ?\{) + (when (eq (c-last-command-char) ?\{) (cond ((and (memq 'brace-else-brace c-cleanup-list) (re-search-backward ＠＠ -816,7 +816,7 ＠＠ )))) ;; blink the paren - (and (eq last-command-event ?\}) + (and (eq (c-last-command-char) ?\}) (not executing-kbd-macro) old-blink-paren (save-excursion ＠＠ -853,7 +853,7 ＠＠ (when (and (not arg) (eq literal 'c) (memq 'comment-close-slash c-cleanup-list) - (eq last-command-event ?/) + (eq (c-last-command-char) ?/) (looking-at (concat "[ \t]*\\(" (regexp-quote comment-end) "\\)?$")) ; (eq c-block-comment-ender "*/") ; C-style comments ALWAYS end in */ ＠＠ -869,7 +869,7 ＠＠ (setq indentp (and (not arg) c-syntactic-indentation c-electric-flag - (eq last-command-event ?/) + (eq (c-last-command-char) ?/) (eq (char-before) (if literal ?* ?/)))) (self-insert-command (prefix-numeric-value arg)) (if indentp ＠＠ -950,10 +950,10 ＠＠ (let ((pos (- (point-max) (point)))) (if (c-save-buffer-state () (and (or (and - (eq last-command-event ?,) + (eq (c-last-command-char) ?,) (memq 'list-close-comma c-cleanup-list)) (and - (eq last-command-event ?\;) + (eq (c-last-command-char) ?\;) (memq 'defun-close-semi c-cleanup-list))) (progn (forward-char -1) ＠＠ -1110,7 +1110,7 ＠＠ ;; Indent the line if appropriate. (when (and c-electric-flag c-syntactic-indentation c-recognize-<>-arglists) (setq found-delim - (if (eq last-command-event ?<) + (if (eq (c-last-command-char) ?<) ;; If a <, basically see if it's got "template" before it ..... (or (and (progn (backward-char) ＠＠ -1204,7 +1204,7 ＠＠ ;; clean up brace-elseif-brace (when (and (memq 'brace-elseif-brace c-cleanup-list) - (eq last-command-event ?\() + (eq (c-last-command-char) ?\() (re-search-backward (concat "}" "\\([ \t\n]\\|\\\\\n\\)*" ＠＠ -1222,7 +1222,7 ＠＠ ;; clean up brace-catch-brace (when (and (memq 'brace-catch-brace c-cleanup-list) - (eq last-command-event ?\() + (eq (c-last-command-char) ?\() (re-search-backward (concat "}" "\\([ \t\n]\\|\\\\\n\\)*" ＠＠ -1243,7 +1243,7 ＠＠ ;; space-before-funcall clean-up? ((and (memq 'space-before-funcall c-cleanup-list) - (eq last-command-event ?\() + (eq (c-last-command-char) ?\() (save-excursion (backward-char) (skip-chars-backward " \t") ＠＠ -1261,7 +1261,7 ＠＠ ;; compact-empty-funcall clean-up? ((c-save-buffer-state () (and (memq 'compact-empty-funcall c-cleanup-list) - (eq last-command-event ?\)) + (eq (c-last-command-char) ?\)) (save-excursion (c-safe (backward-char 2)) (when (looking-at "()") ＠＠ -1290,7 +1290,7 ＠＠ (when (c-save-buffer-state () (and c-electric-flag c-syntactic-indentation - (not (eq last-command-event ?_)) + (not (eq (c-last-command-char) ?_)) (= (save-excursion (skip-syntax-backward "w") (point)) diff -r 46a489fd8658e00feee07abcdf12e8e0c2132994 -r 3588e63d2bb91225166a37e2f90af1230aa0d4fb cc-defs.el --- a/cc-defs.el +++ b/cc-defs.el ＠＠ -391,6 +391,13 ＠＠ `(int-to-char ,integer) integer)) +(defmacro c-last-command-char () + ;; The last character just typed. Note that `last-command-event' exists in + ;; both Emacs and XEmacs, but with confusingly different meanings. + (if (featurep 'xemacs) + 'last-command-char + 'last-command-event)) + (defmacro c-sentence-end () ;; Get the regular expression `sentence-end'. (if (cc-bytecomp-fboundp 'sentence-end) https://bitbucket.org/xemacs/cc-mode/commits/3a2a90216ffe/ changeset: 3a2a90216ffe user: acm date: 2013-03-04 19:43:34 summary: Merge. affected #: 3 files diff -r 3588e63d2bb91225166a37e2f90af1230aa0d4fb -r 3a2a90216ffe53e1b80d556503b5cd053a42ba71 .hgtags --- a/.hgtags +++ b/.hgtags ＠＠ -93,3 +93,5 ＠＠ 46f8e9f7f8174bdf529daf1577892b212c566d5b cc-mode-1_58 c325532f7d0bbf9c4cae63da83d12abf2033c6b5 cc-mode-1_59 84035315a6ee61c74a5ebd43dab790318c1cc9a3 cc-mode-1_60 +193c0f9dbfbac71e083f2974efc724a82d1106c5 cc-mode-1_62 +b855e452c23959bb9efcd397f3739ba11ad97718 cc-mode-1_63 diff -r 3588e63d2bb91225166a37e2f90af1230aa0d4fb -r 3a2a90216ffe53e1b80d556503b5cd053a42ba71 ChangeLog --- a/ChangeLog +++ b/ChangeLog ＠＠ -1,3 +1,23 ＠＠ +2013-02-08 Norbert Koch <viteno(a)xemacs.org&gt; + + * Makefile (VERSION): XEmacs package 1.63 released. + +2013-02-08 Norbert Koch <viteno(a)xemacs.org&gt; + + * Makefile (VERSION): XEmacs package 1.62 released. + +2013-02-08 Norbert Koch <viteno(a)xemacs.org&gt; + + * Makefile (VERSION): XEmacs package 1.62 released. + +2013-02-08 Norbert Koch <viteno(a)xemacs.org&gt; + + * Makefile (VERSION): XEmacs package 1.62 released. + +2013-02-08 Norbert Koch <viteno(a)xemacs.org&gt; + + * Makefile (VERSION): XEmacs package 1.62 released. + 2013-01-27 Norbert Koch <viteno(a)xemacs.org&gt; * Makefile (VERSION): XEmacs package 1.60 released. diff -r 3588e63d2bb91225166a37e2f90af1230aa0d4fb -r 3a2a90216ffe53e1b80d556503b5cd053a42ba71 Makefile --- a/Makefile +++ b/Makefile ＠＠ -17,7 +17,7 ＠＠ # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. -VERSION = 1.60 +VERSION = 1.63 AUTHOR_VERSION = 5.32.2 MAINTAINER = Alan Mackenzie <bug-cc-mode(a)gnu.org&gt; PACKAGE = cc-mode Repository URL: https://bitbucket.org/xemacs/cc-mode/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ XEmacs-Patches mailing list XEmacs-Patches(a)xemacs.org http://lists.xemacs.org/mailman/listinfo/xemacs-patches