commit 65ac8bc6a9e256b60c8ddfa3c99a1b28145a0763 (HEAD, refs/remotes/origin/master) Author: Paul Eggert Date: Sat Apr 18 19:54:58 2015 -0700 ; Fix more-recent commit messages too diff --git a/ChangeLog.2 b/ChangeLog.2 index 89fe77f..90ef58c 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1,6 +1,6 @@ 2015-04-18 Paul Eggert - Prefer "Bug#1234" in commit messages + Prefer "Bug#1234" in commit messages (Bug#20325) * .dir-locals.el (log-edit-mode): Don't rewrite Bug#, as this isn't useful for Git. * CONTRIBUTE: Suggest "Bug#1234" instead of "Fixes: debbugs:1234". @@ -8,26 +8,26 @@ 2015-04-18 Glenn Morris * lisp/files.el (auto-mode-alist): Use conf mode for gitconfig, hgrc. - Fixes: debbugs:19506 + (Bug#19506) 2015-04-18 Tom Willemse (tiny change) * lisp/elec-pair.el (electric-pair-post-self-insert-function): Do not use `chomp' as a function. - Fixes: debbugs:19505 + (Bug#19505) 2015-04-18 Glenn Morris * lisp/net/browse-url.el (browse-url, browse-url-at-point): Doc fixes. * doc/emacs/misc.texi (Sorting): Small edit. - Fixes: debbugs:19896 + (Bug#19896) * admin/admin.el (make-manuals): Add emacs-xtra in pdf and ps. 2015-04-18 Simen Heggestøyl css-mode.el: Support multi-line comment filling - Fixes: debbugs:20256 + (Bug#20256) * lisp/textmodes/css-mode.el (css-fill-paragraph): Support multi-line comment filling. (css-adaptive-fill): New function. @@ -44,7 +44,7 @@ * lisp/leim/quail/cyrillic.el (bulgarian-phonetic, bulgarian-bds): Replace U+042C with U+045D, as the former character is not used in the modern Bulgarian language. - Fixes: Bug#20350 + (Bug#20350) 2015-04-17 Thomas Fitzsimmons @@ -80,7 +80,7 @@ 2015-04-17 Stefan Monnier * lisp/indent.el (indent-region): Don't deactivate the mark - Fixes: debbugs:20357 + (Bug#20357) 2015-04-17 Sam Steingold commit f48a28e34398551c719807c59819a5dab5f34aa8 Author: Paul Eggert Date: Sat Apr 18 19:51:18 2015 -0700 ; make change-history-commit diff --git a/ChangeLog.2 b/ChangeLog.2 index 044f888..89fe77f 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -1,3 +1,99 @@ +2015-04-18 Paul Eggert + + Prefer "Bug#1234" in commit messages + * .dir-locals.el (log-edit-mode): Don't rewrite Bug#, + as this isn't useful for Git. + * CONTRIBUTE: Suggest "Bug#1234" instead of "Fixes: debbugs:1234". + +2015-04-18 Glenn Morris + + * lisp/files.el (auto-mode-alist): Use conf mode for gitconfig, hgrc. + Fixes: debbugs:19506 + +2015-04-18 Tom Willemse (tiny change) + + * lisp/elec-pair.el (electric-pair-post-self-insert-function): Do not use `chomp' as a function. + Fixes: debbugs:19505 + +2015-04-18 Glenn Morris + + * lisp/net/browse-url.el (browse-url, browse-url-at-point): Doc fixes. + + * doc/emacs/misc.texi (Sorting): Small edit. + Fixes: debbugs:19896 + + * admin/admin.el (make-manuals): Add emacs-xtra in pdf and ps. + +2015-04-18 Simen Heggestøyl + + css-mode.el: Support multi-line comment filling + Fixes: debbugs:20256 + * lisp/textmodes/css-mode.el (css-fill-paragraph): Support multi-line + comment filling. + (css-adaptive-fill): New function. + (css-mode): Set `adaptive-fill-function'. + (scss-mode): Set `comment-continue'. + +2015-04-18 Nicolas Petton + + * lisp/emacs-lisp/seq.el (seq-concatenate, seq-into): Better error messages. + +2015-04-18 Ivan Radanov Ivanov (tiny change) + + Minor improvements in Bulgarian input methods + * lisp/leim/quail/cyrillic.el (bulgarian-phonetic, bulgarian-bds): + Replace U+042C with U+045D, as the former character is not used in + the modern Bulgarian language. + Fixes: Bug#20350 + +2015-04-17 Thomas Fitzsimmons + + Improve EUDC manual + * eudc.texi (LDAP Configuration): Mention simple and SASL + authentication schemes. Add index items. Shorten example server + name. + +2015-04-17 Dmitry Gutov + + Don't show both feature and function with the same name + * lisp/progmodes/elisp-mode.el (elisp--xref-identifier-location): + Don't show both feature and function with the same name. + + (elisp--xref-identifier-location): Skip variable, if it's also a functiong + * lisp/progmodes/elisp-mode.el (elisp--xref-identifier-location): + Avoid returning both the variable and the function for the same + minor mode. + +2015-04-17 Wolfgang Jenkner + + Fix fontification of keywords clobbered by the prompt. + * lisp/comint.el (comint-output-filter): Remove the uses of + with-silent-modifications I introduced as part of the last change. + This fixes, e.g., erratically missing highlighting when running + ./configure --help; ./configure in a shell-mode buffer with + compilation-shell-minor-mode turned on. + +2015-04-17 Glenn Morris + + * admin/authors.el (authors-valid-file-names, authors-renamed-files-alist): Additions. + +2015-04-17 Stefan Monnier + + * lisp/indent.el (indent-region): Don't deactivate the mark + Fixes: debbugs:20357 + +2015-04-17 Sam Steingold + + lisp/net/rcirc.el (defun-rcirc-command): mark `target' as ignorable + +2015-04-16 Leo Liu + + * lisp/progmodes/xref.el (xref-push-marker-stack): Add optional arg. + +2015-04-16 Stefan Monnier + + * lisp/erc/erc-pcomplete.el (erc-pcomplete): Don't use `pcomplete' any more. + 2015-04-16 Glenn Morris * admin/authors.el (authors-lax-changelogs): Update for erc changes. diff --git a/Makefile.in b/Makefile.in index 5152a17..f065cd3 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1092,7 +1092,7 @@ bootstrap: bootstrap-clean .PHONY: master-branch-is-current no-ChangeLog unchanged-history-files # The newest revision that should not appear in the generated ChangeLog. -gen_origin = 455f13b8c91a51cd08e19fda737a4358a9a927d6 +gen_origin = 870287327b1fba7105599eeabac5a2aa5ebadf19 # Convert git commit log to ChangeLog file. make-dist uses this. ChangeLog: commit 870287327b1fba7105599eeabac5a2aa5ebadf19 Author: Paul Eggert Date: Sat Apr 18 19:45:38 2015 -0700 ; Convert ChangeLog history files to "Bug#NNNN" diff --git a/ChangeLog.1 b/ChangeLog.1 index 6e2b4fc..d1b8d0f 100644 --- a/ChangeLog.1 +++ b/ChangeLog.1 @@ -55,7 +55,7 @@ (HAVE_PTHREAD, LIB_PTHREAD): Port better to FreeBSD, by also checking for pthread_create, pthread_self, pthread_sigmask. Tighten the test for pthread_atfork while we're at it. - Fixes: bug#20136 + (Bug#20136) Merge from gnulib This incorporates: @@ -76,7 +76,7 @@ Don't require GNU putenv * configure.ac: Use system putenv even if it lacks GNU features, as we don't need them. This works around a bug in FreeBSD 10.1 getenv. - Fixes: bug#19874 + (Bug#19874) 2015-02-25 Paul Eggert @@ -170,7 +170,7 @@ If gnustep-config works, use 'gnustep-config --objc-flags' and 'gnustep-config --gui-libs' to compute GNUstep configuration variables, instead of attempting to infer them individually. - Fixes: bug#19507 + (Bug#19507) 2015-01-21 Ulrich Müller @@ -198,7 +198,7 @@ * INSTALL: Document this. * configure.ac: Add AM_SILENT_RULES([yes]). (AM_DEFAULT_VERBOSITY): Remove now-unnecessary initialization. - Fixes: bug#19501 + (Bug#19501) 2015-01-06 Paul Eggert diff --git a/ChangeLog.2 b/ChangeLog.2 index 2ecf2b5..044f888 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -16,7 +16,7 @@ Pre-4.6 GCC succeeds with unknown option * configure.ac (emacs_cv_prog_cc_nopie): Port to pre-4.6 GCC. - Fixes: bug#20338 + (Bug#20338) 2015-04-15 Paul Eggert @@ -46,7 +46,7 @@ both jpeglib.h and jerror.h features. Remove special case for mingw32, which should no longer be needed (and if it were needed, should now be addressable by hotwiring emacs_cv_jpeglib). - Fixes: bug#20332 + (Bug#20332) 2015-04-15 Stefan Monnier @@ -100,7 +100,7 @@ 2015-04-15 Stefan Monnier * src/lread.c (intern_1): Make sure we'd find the symbol we add - Fixes: debbugs:20334 + (Bug#20334) * src/xfaces.c (resolve_face_name): Don't use `intern' with Lisp_Strings. 2015-04-15 Glenn Morris @@ -169,7 +169,7 @@ Describe problems with cursor caused by Windows Magnifier * etc/PROBLEMS: Describe the problem with cursor shape on MS-Windows due to Windows Magnifier. - Fixes: Bug#20271 + (Bug#20271) Make [:print:] support non-ASCII characters correctly * src/regex.c (ISPRINT): Call 'printablep' for multibyte characters. @@ -254,7 +254,7 @@ 2015-04-13 Dmitry Gutov Change diff-switches default to `-u' - Fixes: debbugs:20290 + (Bug#20290) * doc/emacs/files.texi (Comparing Files): Document the new default value of `diff-switches'. * doc/emacs/trouble.texi (Sending Patches): Document the preference @@ -276,7 +276,7 @@ 2015-04-13 Stefan Monnier * lisp/loadup.el ("cus-start"): Load it after loaddefs.el - Fixes: debbugs:20321 + (Bug#20321) * lisp/cus-start.el (read-buffer-function): Don't advertize iswitchb-read-buffer any more. (iswitchb): Don't tweak this obsolete group any more. @@ -432,7 +432,7 @@ Use completion-separator-chars rather than local key binding. * src/*.c: Set deactivate_mark buffer-locally - Fixes: debbugs:20260 + (Bug#20260) * src/insdel.c (prepare_to_modify_buffer_1): * src/fileio.c (Finsert_file_contents): Set deactivate_mark buffer-locally. @@ -440,7 +440,7 @@ 2015-04-12 Fabián Ezequiel Gallina python.el: Keep symmetry on sexp navigation with parens - Fixes: debbugs:19954 + (Bug#19954) * lisp/progmodes/python.el (python-nav--forward-sexp): Add argument skip-parens-p. (python-nav-forward-sexp, python-nav-backward-sexp) @@ -466,7 +466,7 @@ * configure.ac (MAIL_USE_MMDF): Remove. * etc/NEWS: Document this. * lib-src/movemail.c: Assume MAIL_USE_MMDF is not defined. - Fixes: bug#20308 + (Bug#20308) * doc/man/ChangeLog.01: Rename from doc/man/ChangeLog.1. That way, 'make install' won't think it's a man page. @@ -675,7 +675,7 @@ * src/gnutls.c (syms_of_gnutls) : New DEFSYM. * lisp/term/w32-win.el (dynamic-library-alist): Determine which GnuTLS DLL to load according to value of libgnutls-version. - Fixes: bug#20294 + (Bug#20294) 2015-04-11 Paul Eggert @@ -863,7 +863,7 @@ 2015-04-09 Simen Heggestøyl css-mode.el: Add "not" pseudo-class - Fixes: debbugs:20267 + (Bug#20267) * lisp/textmodes/css-mode.el (css-pseudo-class-ids): Add "not" to list of CSS pseudo-classes. @@ -904,12 +904,12 @@ 2015-04-09 Boruch Baum (tiny change) * lisp/bookmark.el (bookmark-bmenu-goto-bookmark): Don't inf-loop. - Fixes: debbugs:20212 + (Bug#20212) 2015-04-09 Stefan Monnier Stop messing with the EMACS env var - Fixes: debbugs:20202 + (Bug#20202) * lisp/net/tramp-sh.el (tramp-remote-process-environment): * lisp/comint.el (comint-exec-1): * lisp/term.el (term-exec-1): Don't set EMACS envvar. @@ -917,14 +917,14 @@ INSIDE_EMACS's format in line with other users. css-mode.el (css-smie-rules): Fix indentation after complex selectors - Fixes: debbugs:20282 + (Bug#20282) * lisp/textmodes/css-mode.el (css-smie-rules): Don't get confused by inner structure of selectors. 2015-04-08 Fabián Ezequiel Gallina python.el: Indent docstring lines to base-indent - Fixes: debbugs:19595 + (Bug#19595) Thanks to immerrr for reporting and providing an initial patch. * lisp/progmodes/python.el @@ -935,7 +935,7 @@ (python-indent-inside-string-2): Fix tests. python.el: Increase native completion robustness - Fixes: debbugs:19755 + (Bug#19755) Thanks to Carlos Pita for reporting this and providing useful ideas. * lisp/progmodes/python.el @@ -952,7 +952,7 @@ 2015-04-08 Samer Masterson * lisp/eshell: Make backslash a no-op in front of normal chars - Fixes: debbugs:8531 + (Bug#8531) * lisp/eshell/esh-arg.el (eshell-parse-argument-hook): Update comment. (eshell-parse-backslash): Return escaped character after backslash if it is special. Otherwise, if the backslash is not in a quoted @@ -969,7 +969,7 @@ * lisp/vc/diff-mode.el (diff-hunk-file-names): Don't require a TAB after the file name. - Fixes: debbugs:20276 + (Bug#20276) 2015-04-08 Paul Eggert @@ -1006,7 +1006,7 @@ 2015-04-08 Stefan Monnier (eieio-copy-parents-into-subclass): Fix inheritance of initargs - Fixes: debbugs:20270 + (Bug#20270) * lisp/emacs-lisp/eieio-core.el (eieio-copy-parents-into-subclass): Fix inheritance of initargs. @@ -1023,7 +1023,7 @@ 2015-04-08 Eli Zaretskii * src/eval.c (init_eval_once): Bump max_lisp_eval_depth to 800 - Fixes: bug#17517 + (Bug#17517) 2015-04-08 Michael Albinus @@ -1043,7 +1043,7 @@ 2015-04-07 Dmitry Gutov ffap: Support environment variable expansion in file names - Fixes: debbugs:19839 + (Bug#19839) * lisp/ffap.el (ffap-string-at-point-mode-alist): Support environment variable expansion in file names. @@ -1053,7 +1053,7 @@ 2015-04-07 Stefan Monnier - Fixes: debbugs:20257 + (Bug#20257) * lisp/files.el (set-visited-file-name): Clear auto-save if nil. 2015-04-07 Ivan Shmakov @@ -1069,7 +1069,7 @@ Add doc strings for some Isearch state vars * lisp/misearch.el (multi-isearch-buffer-list) (multi-isearch-file-list): Add doc strings. - Fixes: bug#20232 + (Bug#20232) 2015-04-07 Alan Mackenzie @@ -1110,7 +1110,7 @@ .git directory. Distribute the new ChangeLog history files instead of scattered ChangeLog files. Distribute the new files gitlog-to-changelog and gitlog-to-emacslog. - Fixes: bug#19113 + (Bug#19113) Rename ChangeLogs for gitlog-to-changelog This patch was implemented via the following shell commands: @@ -1146,4 +1146,3 @@ See ChangeLog.1 for earlier changes. ;; Local Variables: ;; coding: utf-8 ;; End: - diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index 8984f48..a40f8f3 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 @@ -502,7 +502,7 @@ 2015-03-20 Alan Mackenzie - Fix debbugs#20146 + Fix Bug#20146 * font-lock.el (font-lock-extend-jit-lock-region-after-change): Return the calculated values, as per spec. @@ -693,7 +693,7 @@ 2015-03-16 Alan Mackenzie - Edebug: Allow "S" to work during trace mode. Fixes debbugs #20074. + Edebug: Allow "S" to work during trace mode. Fixes Bug#20074. Also display the overlay arrow in go and go-nonstop modes. * emacs-lisp/edebug.el (edebug--display-1): Move the diff --git a/src/ChangeLog.13 b/src/ChangeLog.13 index 33d0b9b..328f798 100644 --- a/src/ChangeLog.13 +++ b/src/ChangeLog.13 @@ -124,7 +124,7 @@ Fix minor ldexp issues * floatfns.c (Fldexp): Require 2 args. Avoid undefined behavior if the exponent is out of 'int' range. Improve documentation. - Fixes: bug#20185 + (Bug#20185) 2015-03-24 Daniel Colascione @@ -215,7 +215,7 @@ Work around x86 glibc backtrace bug * sysdep.c (emacs_backtrace): Don't dump core on x86. - Fixes: bug#19959 + (Bug#19959) 2015-03-05 Eli Zaretskii @@ -1079,7 +1079,7 @@ to unused args. * lisp.h (CALLMANY, CALLN): New macros. * sound.c (Fplay_sound_internal): Coalesce duplicate code. - Fixes: bug#19634 + (Bug#19634) Use gnustep-config if available * emacs.c [NS_IMPL_GNUSTEP]: Don't include . @@ -1103,7 +1103,7 @@ Don't downcase system diagnostics' first letters * fileio.c (report_file_errno): Don't downcase, and simplify. - Fixes: bug#19642 + (Bug#19642) Isolate NIL_IS_ZERO-assuming code better Suggested by Stefan Monnier in: @@ -1148,7 +1148,7 @@ Correct an old fix for GTK font selection * gtkutil.c (xg_get_font): Fix off-by-2 typo. - Fixes: bug#3228 + (Bug#3228) Fix minor bugs with printing null bytes * minibuf.c (read_minibuf_noninteractive): @@ -2137,7 +2137,7 @@ * fileio.c (Finsert_file_contents): Compute same_at_end character position using the old buffer size, not the new one, since restore_window_points wants the old size. - Fixes: debbugs:19161 + (Bug#19161) 2014-12-14 Alan Mackenzie diff --git a/test/ChangeLog.1 b/test/ChangeLog.1 index 813f5dd..7f8eecf 100644 --- a/test/ChangeLog.1 +++ b/test/ChangeLog.1 @@ -307,7 +307,7 @@ * indent/shell.sh (bar): Use '[ $# -eq 0 ]', not '[ $# == 0 ]'. This is more portable in shell scripts. - Fixes: bug#19658 + (Bug#19658) 2015-01-23 Dmitry Gutov commit f2da220b5fde8575812784f6a9e5f7df9560e838 Author: Paul Eggert Date: Sat Apr 18 19:08:53 2015 -0700 Prefer "Bug#1234" in commit messages * .dir-locals.el (log-edit-mode): Don't rewrite Bug#, as this isn't useful for Git. * CONTRIBUTE: Suggest "Bug#1234" instead of "Fixes: debbugs:1234". diff --git a/.dir-locals.el b/.dir-locals.el index f899b51..9853d7b 100644 --- a/.dir-locals.el +++ b/.dir-locals.el @@ -3,9 +3,7 @@ (fill-column . 70))) (c-mode . ((c-file-style . "GNU"))) (objc-mode . ((c-file-style . "GNU"))) - (log-edit-mode . ((log-edit-rewrite-fixes - "[ \n](bug#\\([0-9]+\\))" . "debbugs:\\1") - (log-edit-font-lock-gnu-style . t) + (log-edit-mode . ((log-edit-font-lock-gnu-style . t) (log-edit-setup-add-author . t))) (change-log-mode . ((add-log-time-zone-rule . t) (fill-column . 74) diff --git a/CONTRIBUTE b/CONTRIBUTE index 476b361..4205bc3 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE @@ -42,12 +42,11 @@ in its message. Here is an example commit message (indented): Deactivate shifted region Do not silently extend a region that is not highlighted; - this can happen after a shift. + this can happen after a shift (Bug#19003). * doc/emacs/mark.texi (Shift Selection): Document the change. * lisp/window.el (handle-select-window): * src/frame.c (Fhandle_switch_frame, Fselected_frame): Deactivate the mark. - Fixes: bug#19003 The general format is as follows. @@ -113,11 +112,9 @@ The general format is as follows. Copyright-paperwork-exempt: yes -- If the commit fixes a bug, append a separate line - - Fixes: bug#NNNN - - where NNNN is the bug number. +- The commit message should contain "Bug#NNNNN" if it is related to + bug number NNNNN in the debbugs database. This string is often + parenthesized, as in "(Bug#19003)". - In ChangeLog entries, there is no standard or recommended way to identify revisions. commit f4f1380deac296fb6ece142b16bf0ae2f3bdbd4d Author: Glenn Morris Date: Sat Apr 18 18:37:01 2015 -0700 * lisp/files.el (auto-mode-alist): Use conf mode for gitconfig, hgrc. Fixes: debbugs:19506 diff --git a/lisp/files.el b/lisp/files.el index 5ef7318..0b011f4 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2519,7 +2519,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'" . archive-mode) ;; this has lower priority to avoid matching changelog.sgml etc. ("[cC]hange[lL]og[-.][-0-9a-z]+\\'" . change-log-mode) ;; either user's dot-files or under /etc or some such - ("/\\.?\\(?:gnokiirc\\|kde.*rc\\|mime\\.types\\|wgetrc\\)\\'" . conf-mode) + ("/\\.?\\(?:gitconfig\\|gnokiirc\\|hgrc\\|kde.*rc\\|mime\\.types\\|wgetrc\\)\\'" . conf-mode) ;; alas not all ~/.*rc files are like this ("/\\.\\(?:enigma\\|gltron\\|gtk\\|hxplayer\\|net\\|neverball\\|qt/.+\\|realplayer\\|scummvm\\|sversion\\|sylpheed/.+\\|xmp\\)rc\\'" . conf-mode) ("/\\.\\(?:gdbtkinit\\|grip\\|orbital/.+txt\\|rhosts\\|tuxracer/options\\)\\'" . conf-mode) commit ef6302ff1a95fbb86a575d3124717ae2557181e5 Author: Tom Willemse Date: Sat Apr 18 18:07:16 2015 -0700 * lisp/elec-pair.el (electric-pair-post-self-insert-function): Do not use `chomp' as a function. Fixes: debbugs:19505 Copyright-paperwork-exempt: yes diff --git a/lisp/elec-pair.el b/lisp/elec-pair.el index 562b294..db812c9 100644 --- a/lisp/elec-pair.el +++ b/lisp/elec-pair.el @@ -475,7 +475,8 @@ happened." (when (and (not (and unconditional (eq syntax ?\"))) (setq skip-whitespace-info - (if (functionp electric-pair-skip-whitespace) + (if (and (not (eq electric-pair-skip-whitespace 'chomp)) + (functionp electric-pair-skip-whitespace)) (funcall electric-pair-skip-whitespace) electric-pair-skip-whitespace))) (electric-pair--skip-whitespace)) commit 1abf64fe2a56b9ea158471b9687689bf1562d4c3 Author: Glenn Morris Date: Sat Apr 18 18:00:02 2015 -0700 * lisp/net/browse-url.el (browse-url, browse-url-at-point): Doc fixes. diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el index 933d292..3f8cb84 100644 --- a/lisp/net/browse-url.el +++ b/lisp/net/browse-url.el @@ -761,10 +761,13 @@ narrowed." ;;;###autoload (defun browse-url (url &rest args) "Ask a WWW browser to load URL. -Prompt for a URL, defaulting to the URL at or before point. Variable -`browse-url-browser-function' says which browser to use. +Prompt for a URL, defaulting to the URL at or before point. +The variable `browse-url-browser-function' says which browser to use. If the URL is a mailto: URL, consult `browse-url-mailto-function' -first, if that exists." +first, if that exists. + +Passes any ARGS to the browser function. +The default is to pass `browse-url-new-window-flag'." (interactive (browse-url-interactive-arg "URL: ")) (unless (called-interactively-p 'interactive) (setq args (or args (list browse-url-new-window-flag)))) @@ -800,7 +803,9 @@ first, if that exists." ;;;###autoload (defun browse-url-at-point (&optional arg) "Ask a WWW browser to load the URL at or before point. -Variable `browse-url-browser-function' says which browser to use." +Variable `browse-url-browser-function' says which browser to use. +Optional prefix argument ARG non-nil inverts the value of the option +`browse-url-new-window-flag'." (interactive "P") (let ((url (browse-url-url-at-point))) (if url commit d4bbc769e86653d7d23c51bddb5018eda84308c9 Author: Glenn Morris Date: Sat Apr 18 17:48:04 2015 -0700 * doc/emacs/misc.texi (Sorting): Small edit. Fixes: debbugs:19896 diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index f1b3c3f..20996c2 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -2119,13 +2119,14 @@ to @code{sort-numeric-base}, but numbers beginning with @samp{0x} or @item M-x sort-columns Like @kbd{M-x sort-fields} except that the text within each line -used for comparison comes from a fixed range of columns. See below -for an explanation. +used for comparison comes from a fixed range of columns. With a +prefix argument, sort in reverse order. See below for more details +on this command. @findex reverse-region @item M-x reverse-region Reverse the order of the lines in the region. This is useful for -sorting into descending order by fields or columns, since those sort +sorting into descending order by fields, since those sort commands do not have a feature for doing that. @end table commit 2c38f1358250afa1393d08ec5cec3ade80d5ea0f Author: Glenn Morris Date: Sat Apr 18 14:30:32 2015 -0700 * admin/admin.el (make-manuals): Add emacs-xtra in pdf and ps. diff --git a/admin/admin.el b/admin/admin.el index f7b9155..93e9124 100644 --- a/admin/admin.el +++ b/admin/admin.el @@ -199,6 +199,7 @@ Optional argument TYPE is type of output (nil means all)." (ps-dir (expand-file-name "ps" dest)) (pdf-dir (expand-file-name "pdf" dest)) (emacs (expand-file-name "doc/emacs/emacs.texi" root)) + (emacs-xtra (expand-file-name "doc/emacs/emacs-xtra.texi" root)) (elisp (expand-file-name "doc/lispref/elisp.texi" root)) (eintr (expand-file-name "doc/lispintro/emacs-lisp-intro.texi" root)) (misc (manual-misc-manuals root))) @@ -212,10 +213,14 @@ Optional argument TYPE is type of output (nil means all)." (manual-html-node emacs (expand-file-name "emacs" html-node-dir))) (if (member type '(nil "emacs" "emacs-mono")) (manual-html-mono emacs (expand-file-name "emacs.html" html-mono-dir))) - (if (member type '(nil "emacs" "emacs-pdf" "pdf")) - (manual-pdf emacs (expand-file-name "emacs.pdf" pdf-dir))) - (if (member type '(nil "emacs" "emacs-ps" "ps")) - (manual-ps emacs (expand-file-name "emacs.ps" ps-dir))) + (when (member type '(nil "emacs" "emacs-pdf" "pdf")) + (manual-pdf emacs (expand-file-name "emacs.pdf" pdf-dir)) + ;; emacs-xtra exists only in pdf/ps format. + ;; In other formats it is included in the Emacs manual. + (manual-pdf emacs-xtra (expand-file-name "emacs-xtra.pdf" pdf-dir))) + (when (member type '(nil "emacs" "emacs-ps" "ps")) + (manual-ps emacs (expand-file-name "emacs.ps" ps-dir)) + (manual-ps emacs-xtra (expand-file-name "emacs-xtra.ps" ps-dir))) (if (member type '(nil "elisp" "elisp-node")) (manual-html-node elisp (expand-file-name "elisp" html-node-dir))) (if (member type '(nil "elisp" "elisp-mono")) commit b210cb55b3fcf83f3a8fe2f24116694cc825ffe0 Author: Glenn Morris Date: Sat Apr 18 14:09:12 2015 -0700 ; * admin/make-tarball.txt: Misc updates. diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt index 8190e9e..d326282 100644 --- a/admin/make-tarball.txt +++ b/admin/make-tarball.txt @@ -63,6 +63,14 @@ General steps (for each step, check for possible errors): actual release. If you need another release candidate, remember to adjust the ChangeLog entries. + If you need to change only a file(s) that cannot possibly affect + the build (README, ChangeLog, NEWS, etc.) then rather than doing + an entirely new build, it is better to unpack the existing + tarfile, modify the file(s), and tar it back up again. + + Never replace an existing tarfile! If you need to fix something, + always upload it with a different name. + 4. autoreconf -i -I m4 --force make bootstrap @@ -160,8 +168,38 @@ General steps (for each step, check for possible errors): of past announcements. The first pretest announcement, and the release announcement, should have more detail. -12. For a release, update the Emacs homepage emacs.html in the web repository. - Also update history.html, and add the new NEWS file as news/NEWS.xx.y. - Regenerate the html manuals (use make-manuals from admin.el). - If there are new manuals, add appropriate index pages. - Delete any old manual pages that are no longer present. +12. After a release, update the Emacs pages as below. + + +UPDATING THE EMACS WEB PAGES AFTER A RELEASE + +As soon as possible after a release, the Emacs web pages should be updated. +Anyone with write access to the Emacs code repository can do this. +For instructions, see . +Changes go live more or less as soon as they are committed. + +The pages to update are: + +emacs.html (for a new major release, a more thorough update is needed) +history.html +add the new NEWS file as news/NEWS.xx.y + +Use M-x make-manuals from admin/admin.el to regenerate the html +manuals in manual/. If there are new manuals, add appropriate index +pages in manual/ and add them to manual/index.html. In the +manual/html_node directory, delete any old manual pages that are no +longer present. + +Tar up the generated html_node/emacs/ and elisp/ directories and update +the files manual/elisp.html_node.tar.gz and emacs.html_node.tar.gz. + +Use M-x make-manuals-dist from from admin/admin.el to update the +manual/texi/ tarfiles. + +Add compressed copies of the main info pages from the tarfile to manual/info/. + +Update the refcards/pdf/ and ps/ directories, and also +refcards/emacs-refcards.tar.gz (use make -C etc/refcards pdf ps dist). + +Browsing is one +way to check for any files that still need updating. commit 1dee790fc1467709bcb2fb651b23b521e9ca71da Author: Simen Heggestøyl Date: Sat Apr 18 20:25:40 2015 +0200 css-mode.el: Support multi-line comment filling Fixes: debbugs:20256 * lisp/textmodes/css-mode.el (css-fill-paragraph): Support multi-line comment filling. (css-adaptive-fill): New function. (css-mode): Set `adaptive-fill-function'. (scss-mode): Set `comment-continue'. diff --git a/lisp/textmodes/css-mode.el b/lisp/textmodes/css-mode.el index d1893a3..424cdb7 100644 --- a/lisp/textmodes/css-mode.el +++ b/lisp/textmodes/css-mode.el @@ -381,7 +381,8 @@ pseudo-classes, and at-rules." (setq-local comment-start-skip "/\\*+[ \t]*") (setq-local comment-end "*/") (setq-local comment-end-skip "[ \t]*\\*+/") - (setq-local fill-paragraph-function 'css-fill-paragraph) + (setq-local fill-paragraph-function #'css-fill-paragraph) + (setq-local adaptive-fill-function #'css-adaptive-fill) (setq-local add-log-current-defun-function #'css-current-defun-name) (smie-setup css-smie-grammar #'css-smie-rules :forward-token #'css-smie--forward-token @@ -395,6 +396,12 @@ pseudo-classes, and at-rules." (defun css-fill-paragraph (&optional justify) (save-excursion + ;; Fill succeeding comment when invoked right before a multi-line + ;; comment. + (when (save-excursion + (beginning-of-line) + (comment-search-forward (point-at-eol) t)) + (goto-char (match-end 0))) (let ((ppss (syntax-ppss)) (eol (line-end-position))) (cond @@ -414,8 +421,11 @@ pseudo-classes, and at-rules." (paragraph-separate (if (and comment-continue (string-match "[^ \t]" comment-continue)) - (concat "\\(?:[ \t]*" (regexp-quote comment-continue) - "\\)?\\(?:" paragraph-separate "\\)") + (concat "\\(?:[ \t]*\\(?:" + (regexp-quote comment-continue) "\\|" + comment-start-skip "\\|" + comment-end-skip "\\)\\)?" + "\\(?:" paragraph-separate "\\)") paragraph-separate)) (paragraph-start (if (and comment-continue @@ -468,6 +478,12 @@ pseudo-classes, and at-rules." ;; Don't use the default filling code. t))))))) +(defun css-adaptive-fill () + (when (looking-at "[ \t]*/\\*[ \t]*") + (let ((str (match-string 0))) + (and (string-match "/\\*" str) + (replace-match " *" t t str))))) + (defun css-current-defun-name () "Return the name of the CSS section at point, or nil." (save-excursion @@ -504,6 +520,7 @@ pseudo-classes, and at-rules." "Major mode to edit \"Sassy CSS\" files." (setq-local comment-start "// ") (setq-local comment-end "") + (setq-local comment-continue " *") (setq-local comment-start-skip "/[*/]+[ \t]*") (setq-local comment-end-skip "[ \t]*\\(?:\n\\|\\*+/\\)") (setq-local font-lock-defaults '(scss-font-lock-keywords nil t))) commit 9760c6cde3f280b2318e9550c2688b1761b09c30 Author: Nicolas Petton Date: Sat Apr 18 20:10:27 2015 +0200 * lisp/emacs-lisp/seq.el (seq-concatenate, seq-into): Better error messages. diff --git a/lisp/emacs-lisp/seq.el b/lisp/emacs-lisp/seq.el index 6f7f3c4..320ee20 100644 --- a/lisp/emacs-lisp/seq.el +++ b/lisp/emacs-lisp/seq.el @@ -221,7 +221,7 @@ TYPE must be one of following symbols: vector, string or list. (`vector (apply #'vconcat seqs)) (`string (apply #'concat seqs)) (`list (apply #'append (append seqs '(nil)))) - (t (error "Not a sequence type name: %s" type)))) + (t (error "Not a sequence type name: %S" type)))) (defun seq-mapcat (function seq &optional type) "Concatenate the result of applying FUNCTION to each element of SEQ. @@ -295,7 +295,7 @@ TYPE can be one of the following symbols: vector, string or list." (`vector (vconcat seq)) (`string (concat seq)) (`list (append seq nil)) - (t (error "Not a sequence type name: %s" type)))) + (t (error "Not a sequence type name: %S" type)))) (defun seq--drop-list (list n) "Return a list from LIST without its first N elements. commit b06b46e280f3772c62c207e73d87c58b78f42119 Author: Simen Heggestøyl Date: Sat Apr 18 20:06:48 2015 +0200 ; ChangeLog fix diff --git a/ChangeLog.2 b/ChangeLog.2 index fbe71a2..2ecf2b5 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -864,8 +864,8 @@ css-mode.el: Add "not" pseudo-class Fixes: debbugs:20267 - * textmodes/css-mode.el (css-pseudo-class-ids): Add "not" to list - of CSS pseudo-classes. + * lisp/textmodes/css-mode.el (css-pseudo-class-ids): Add "not" to + list of CSS pseudo-classes. 2015-04-09 Stefan Monnier