Now on revision 114168. ------------------------------------------------------------ revno: 114168 committer: Alan Mackenzie branch nick: trunk timestamp: Sat 2013-09-07 14:33:50 +0000 message: Correctly fontify Java class constructors. * progmodes/cc-langs.el (c-type-decl-suffix-key): Now matches ")" in Java Mode. (c-recognize-typeless-decls): Set the Java value to t. * progmodes/cc-engine.el (c-forward-decl-or-cast-1): While handling a "(", add a check for, effectively, Java, and handle a "typeless" declaration there. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-09-07 10:29:57 +0000 +++ lisp/ChangeLog 2013-09-07 14:33:50 +0000 @@ -1,3 +1,13 @@ +2013-09-07 Alan Mackenzie + + Correctly fontify Java class constructors. + * progmodes/cc-langs.el (c-type-decl-suffix-key): Now matches ")" + in Java Mode. + (c-recognize-typeless-decls): Set the Java value to t. + * progmodes/cc-engine.el (c-forward-decl-or-cast-1): While + handling a "(", add a check for, effectively, Java, and handle a + "typeless" declaration there. + 2013-09-07 Roland Winkler * textmodes/bibtex.el (bibtex-biblatex-entry-alist): Add optional === modified file 'lisp/progmodes/cc-engine.el' --- lisp/progmodes/cc-engine.el 2013-08-29 17:26:48 +0000 +++ lisp/progmodes/cc-engine.el 2013-09-07 14:33:50 +0000 @@ -6905,32 +6905,38 @@ ;; Skip over type decl prefix operators. (Note similar code in ;; `c-font-lock-declarators'.) - (while (and (looking-at c-type-decl-prefix-key) - (if (and (c-major-mode-is 'c++-mode) - (match-beginning 3)) - ;; If the third submatch matches in C++ then - ;; we're looking at an identifier that's a - ;; prefix only if it specifies a member pointer. - (when (setq got-identifier (c-forward-name)) - (if (looking-at "\\(::\\)") - ;; We only check for a trailing "::" and - ;; let the "*" that should follow be - ;; matched in the next round. - (progn (setq got-identifier nil) t) - ;; It turned out to be the real identifier, - ;; so stop. - nil)) - t)) - - (if (eq (char-after) ?\() + (if (and c-recognize-typeless-decls + (equal c-type-decl-prefix-key "\\<\\>")) + (when (eq (char-after) ?\() (progn (setq paren-depth (1+ paren-depth)) - (forward-char)) - (unless got-prefix-before-parens - (setq got-prefix-before-parens (= paren-depth 0))) - (setq got-prefix t) - (goto-char (match-end 1))) - (c-forward-syntactic-ws)) + (forward-char))) + (while (and (looking-at c-type-decl-prefix-key) + (if (and (c-major-mode-is 'c++-mode) + (match-beginning 3)) + ;; If the third submatch matches in C++ then + ;; we're looking at an identifier that's a + ;; prefix only if it specifies a member pointer. + (when (setq got-identifier (c-forward-name)) + (if (looking-at "\\(::\\)") + ;; We only check for a trailing "::" and + ;; let the "*" that should follow be + ;; matched in the next round. + (progn (setq got-identifier nil) t) + ;; It turned out to be the real identifier, + ;; so stop. + nil)) + t)) + + (if (eq (char-after) ?\() + (progn + (setq paren-depth (1+ paren-depth)) + (forward-char)) + (unless got-prefix-before-parens + (setq got-prefix-before-parens (= paren-depth 0))) + (setq got-prefix t) + (goto-char (match-end 1))) + (c-forward-syntactic-ws))) (setq got-parens (> paren-depth 0)) === modified file 'lisp/progmodes/cc-langs.el' --- lisp/progmodes/cc-langs.el 2013-08-25 13:52:14 +0000 +++ lisp/progmodes/cc-langs.el 2013-09-07 14:33:50 +0000 @@ -2816,7 +2816,8 @@ "\\>") "") "\\)") - (java idl) "\\([\[\(]\\)") + java "\\([\[\(\)]\\)" + idl "\\([\[\(]\\)") (c-lang-defvar c-type-decl-suffix-key (c-lang-const c-type-decl-suffix-key) 'dont-doc) @@ -2937,7 +2938,7 @@ that are preceded by a declaration starting keyword, so e.g. `c-typeless-decl-kwds' may still be used when it's set to nil." t nil - (c c++ objc) t) + (c c++ objc java) t) (c-lang-defvar c-recognize-typeless-decls (c-lang-const c-recognize-typeless-decls)) ------------------------------------------------------------ revno: 114167 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2013-09-07 18:39:29 +0800 message: NEWS fix. diff: === modified file 'etc/NEWS' --- etc/NEWS 2013-09-06 22:46:44 +0000 +++ etc/NEWS 2013-09-07 10:39:29 +0000 @@ -172,10 +172,6 @@ * Changes in Specialized Modes and Packages in Emacs 24.4 -** Icomplete-mode by defaults applies to all forms of minibuffer completion. -(setq icomplete-with-completion-tables '(internal-complete-buffer)) -will revert to the old behavior. - ** The debugger's `e' command evaluates the code in the context at point. This includes using the lexical environment at point, which means that `e' now lets you access lexical variables as well. @@ -336,6 +332,10 @@ *** key bindings to navigate through and select the completions. *** The icomplete-separator is customizable, and its default has changed. *** Removed icomplete-show-key-bindings. +*** Icomplete-mode by defaults applies to all forms of minibuffer completion. +(setq icomplete-with-completion-tables '(internal-complete-buffer)) +will revert to the old behavior. + ** Ido *** Ido has a manual now. ------------------------------------------------------------ revno: 114166 committer: Roland Winkler branch nick: trunk timestamp: Sat 2013-09-07 15:59:57 +0530 message: bibtex-biblatex-entry-alist: Add optional field subtitle for entry type book diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-09-06 22:46:44 +0000 +++ lisp/ChangeLog 2013-09-07 10:29:57 +0000 @@ -1,3 +1,8 @@ +2013-09-07 Roland Winkler + + * textmodes/bibtex.el (bibtex-biblatex-entry-alist): Add optional + field subtitle for entry type book. + 2013-09-06 Stefan Monnier * minibuffer.el: Make minibuffer-complete call completion-in-region === modified file 'lisp/textmodes/bibtex.el' --- lisp/textmodes/bibtex.el 2013-06-25 09:18:09 +0000 +++ lisp/textmodes/bibtex.el 2013-09-07 10:29:57 +0000 @@ -468,7 +468,7 @@ nil (("editor") ("editora") ("editorb") ("editorc") ("translator") ("annotator") ("commentator") - ("introduction") ("foreword") ("afterword") ("titleaddon") + ("introduction") ("foreword") ("afterword") ("subtitle") ("titleaddon") ("maintitle") ("mainsubtitle") ("maintitleaddon") ("language") ("origlanguage") ("volume") ("part") ("edition") ("volumes") ("series") ("number") ("note") ("publisher") ("location") ("isbn") ------------------------------------------------------------ revno: 114165 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-09-07 06:21:22 -0400 message: Auto-commit of loaddefs files. diff: === modified file 'lisp/dired.el' --- lisp/dired.el 2013-09-05 10:21:43 +0000 +++ lisp/dired.el 2013-09-07 10:21:22 +0000 @@ -4352,7 +4352,7 @@ ;;;*** -;;;### (autoloads nil "dired-x" "dired-x.el" "130484d4c94bb9929c210774f9e475f5") +;;;### (autoloads nil "dired-x" "dired-x.el" "1bf4009b81e55bf51947bc87b2c82994") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\ ------------------------------------------------------------ revno: 114164 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-09-07 06:17:39 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2013-09-05 10:17:39 +0000 +++ autogen/configure 2013-09-07 10:17:39 +0000 @@ -7656,6 +7656,13 @@ # The following line should be removable at some point. nw="$nw -Wsuggest-attribute=pure" + # This part is merely for shortening the command line, + # since -Wno-FOO needs to be added below regardless. + nw="$nw -Wmissing-field-initializers" + nw="$nw -Wswitch" + nw="$nw -Wtype-limits" + nw="$nw -Wunused-parameter" + # clang is unduly picky about some things. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler is clang" >&5 $as_echo_n "checking whether the compiler is clang... " >&6; } @@ -10342,6 +10349,25 @@ if test "$window_system" = none && test "$gl_gcc_warnings" = yes; then # Too many warnings for now. + nw= + nw="$nw -Wsuggest-attribute=const" + nw="$nw -Wsuggest-attribute=noreturn" + + gl_warn_set= + set x $WARN_CFLAGS; shift + for gl_warn_item + do + case " $nw " in + *" $gl_warn_item "*) + ;; + *) + gl_warn_set="$gl_warn_set $gl_warn_item" + ;; + esac + done + WARN_CFLAGS=$gl_warn_set + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler handles -Wno-unused-variable" >&5 $as_echo_n "checking whether C compiler handles -Wno-unused-variable... " >&6; } ------------------------------------------------------------ revno: 114163 committer: Paul Eggert branch nick: trunk timestamp: Fri 2013-09-06 17:20:56 -0700 message: Port --without-x --enable-gcc-warnings to Fedora 19. * configure.ac (WERROR_CFLAGS): Omit redundant use of -Wmissing-field-initializers, -Wswitch, -Wtype-limits, -Wunused-parameter. If there is no window system, also omit -Wsuggest-attribute=const and -Wsuggest-attribute=noreturn; this is needed for Fedora 19. * src/gfilenotify.c (globals_of_gfilenotify): Call g_type_init only if using an older glib version that needs it. diff: === modified file 'ChangeLog' --- ChangeLog 2013-09-05 06:25:12 +0000 +++ ChangeLog 2013-09-07 00:20:56 +0000 @@ -1,3 +1,12 @@ +2013-09-07 Paul Eggert + + Port --without-x --enable-gcc-warnings to Fedora 19. + * configure.ac (WERROR_CFLAGS): Omit redundant use of + -Wmissing-field-initializers, -Wswitch, -Wtype-limits, + -Wunused-parameter. If there is no window system, also omit + -Wsuggest-attribute=const and -Wsuggest-attribute=noreturn; this + is needed for Fedora 19. + 2013-09-05 Dmitry Antipov Make --without-x compatible with --enable-gcc-warnings. === modified file 'configure.ac' --- configure.ac 2013-09-05 06:25:12 +0000 +++ configure.ac 2013-09-07 00:20:56 +0000 @@ -826,6 +826,13 @@ # The following line should be removable at some point. nw="$nw -Wsuggest-attribute=pure" + # This part is merely for shortening the command line, + # since -Wno-FOO needs to be added below regardless. + nw="$nw -Wmissing-field-initializers" + nw="$nw -Wswitch" + nw="$nw -Wtype-limits" + nw="$nw -Wunused-parameter" + # clang is unduly picky about some things. AC_CACHE_CHECK([whether the compiler is clang], [emacs_cv_clang], [AC_COMPILE_IFELSE( @@ -1777,6 +1784,11 @@ if test "$window_system" = none && test "$gl_gcc_warnings" = yes; then # Too many warnings for now. + nw= + nw="$nw -Wsuggest-attribute=const" + nw="$nw -Wsuggest-attribute=noreturn" + gl_MANYWARN_COMPLEMENT([WARN_CFLAGS], [$WARN_CFLAGS], [$nw]) + gl_WARN_ADD([-Wno-unused-variable]) gl_WARN_ADD([-Wno-unused-but-set-variable]) gl_WARN_ADD([-Wno-unused-but-set-parameter]) === modified file 'src/ChangeLog' --- src/ChangeLog 2013-09-06 16:40:12 +0000 +++ src/ChangeLog 2013-09-07 00:20:56 +0000 @@ -1,3 +1,9 @@ +2013-09-07 Paul Eggert + + Port --without-x --enable-gcc-warnings to Fedora 19. + * gfilenotify.c (globals_of_gfilenotify): + Call g_type_init only if using an older glib version that needs it. + 2013-09-06 Dmitry Antipov * lisp.h (last_glyphless_glyph_frame, last_glyphless_glyph_face_id) === modified file 'src/gfilenotify.c' --- src/gfilenotify.c 2013-07-16 16:39:42 +0000 +++ src/gfilenotify.c 2013-09-07 00:20:56 +0000 @@ -249,7 +249,9 @@ void globals_of_gfilenotify (void) { +#if ! GLIB_CHECK_VERSION (2, 36, 0) g_type_init (); +#endif watch_list = Qnil; }