From 94898d72a3f26c17db362e8d81fd3b6d8fac582b Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 15 Jan 2013 20:41:31 -0500 Subject: [PATCH 01/13] * Makefile.in (install-arch-indep): Put back a chmod that was removed 2012-05-19. (Bug#13430) --- ChangeLog | 5 +++++ Makefile.in | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 05d15b7dc36..cddaaa58a5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-01-16 Glenn Morris + + * Makefile.in (install-arch-indep): Put back a chmod that was + removed 2012-05-19. (Bug#13430) + 2013-01-10 Glenn Morris * make-dist: Add options for xz compression and no compression. diff --git a/Makefile.in b/Makefile.in index 2916aeccd70..9f1e9707d1d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -534,6 +534,7 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR tar -xvf - && cat > /dev/null) || exit 1; \ [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ for subdir in `find $${dest} -type d -print` ; do \ + chmod a+rx $${subdir} ; \ rm -f $${subdir}/.gitignore ; \ rm -f $${subdir}/.arch-inventory ; \ rm -f $${subdir}/.DS_Store ; \ @@ -568,7 +569,9 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR done ) -chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} -# The last chmod isn't needed at present. +## The above chmods are needed because "umask 022; tar ..." is not +## guaranteed to do the right thing; eg if we are root and tar is +## preserving source permissions. ## We install only the relevant DOC file if possible ## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*. From 41b057adee742ab8e565bc93d5d638aac6d7b3a1 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 15 Jan 2013 20:44:11 -0500 Subject: [PATCH 02/13] * rmailmm.el (rmail-insert-mime-forwarded-message): Revert 2012-12-29 change Ref: (Do not merge to trunk) --- lisp/ChangeLog | 6 ++++++ lisp/mail/rmailmm.el | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 63dd9d0a093..efc9521cda2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-01-16 Glenn Morris + + * mail/rmailmm.el (rmail-insert-mime-forwarded-message): + Revert 2012-12-29 change. Ref: + + 2013-01-10 Fabián Ezequiel Gallina * progmodes/python.el (python-nav-end-of-statement): Fix diff --git a/lisp/mail/rmailmm.el b/lisp/mail/rmailmm.el index 566dec1ad39..71590f51dcb 100644 --- a/lisp/mail/rmailmm.el +++ b/lisp/mail/rmailmm.el @@ -1368,8 +1368,8 @@ This is the usual value of `rmail-insert-mime-forwarded-message-function'." (let ((message-buffer (with-current-buffer forward-buffer (if rmail-buffer-swapped - rmail-view-buffer - forward-buffer)))) + forward-buffer + rmail-view-buffer)))) (save-restriction (narrow-to-region (point) (point)) (message-forward-make-body-mime message-buffer)))) From 827253f7388b3e7ccad021eeedb5bb8674448a16 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 15 Jan 2013 20:47:40 -0500 Subject: [PATCH 03/13] * doc/emacs/custom.texi (Custom Themes): Fix typo. --- doc/emacs/ChangeLog | 4 ++++ doc/emacs/custom.texi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 456d7efa7be..16820ee450a 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2013-01-16 Glenn Morris + + * custom.texi (Custom Themes): Fix typo. + 2013-01-05 Glenn Morris * text.texi (HTML Mode): Remove deleted nxml C-RET binding. diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 6878af14252..cff3892635a 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -555,7 +555,7 @@ or disabled as a unit. You can use Custom themes to switch easily between various collections of settings, and to transfer such collections from one computer to another. - A Custom theme is stored an Emacs Lisp source file. If the name of + A Custom theme is stored as an Emacs Lisp source file. If the name of the Custom theme is @var{name}, the theme file is named @file{@var{name}-theme.el}. @xref{Creating Custom Themes}, for the format of a theme file and how to make one. From f8a42ad607df01eb47ac758a1601f5a9b1673352 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 15 Jan 2013 21:03:06 -0500 Subject: [PATCH 04/13] Doc fixes related to "(declare (indent symbol))" (bug#13450) * doc/lispref/macros.texi (Indenting Macros): Fix order of an indent symbol's arguments. * lisp/emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix. --- doc/lispref/ChangeLog | 5 +++++ doc/lispref/macros.texi | 4 ++-- lisp/ChangeLog | 2 ++ lisp/emacs-lisp/lisp-mode.el | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 59361318ae3..8a35dd6d4bb 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2013-01-16 Glenn Morris + + * macros.texi (Indenting Macros): Fix order of an indent + symbol's arguments. (Bug#13450) + 2013-01-09 Glenn Morris * commands.texi (Interactive Codes): diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi index 9ad00ca0260..5520bbbd1df 100644 --- a/doc/lispref/macros.texi +++ b/doc/lispref/macros.texi @@ -606,12 +606,12 @@ calculate the indentation of a line within this expression. The function receives two arguments: @table @asis +@item @var{pos} +The position at which the line being indented begins. @item @var{state} The value returned by @code{parse-partial-sexp} (a Lisp primitive for indentation and nesting computation) when it parses up to the beginning of this line. -@item @var{pos} -The position at which the line being indented begins. @end table @noindent diff --git a/lisp/ChangeLog b/lisp/ChangeLog index efc9521cda2..c2d869ae827 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2013-01-16 Glenn Morris + * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix. + * mail/rmailmm.el (rmail-insert-mime-forwarded-message): Revert 2012-12-29 change. Ref: diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index a68c727aaba..fc1cfe7afd1 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1148,7 +1148,7 @@ is the buffer position of the start of the containing expression." The function `calculate-lisp-indent' calls this to determine if the arguments of a Lisp function call should be indented specially. -INDENT-POINT is the position where the user typed TAB, or equivalent. +INDENT-POINT is the position at which the line being indented begins. Point is located at the point to indent under (for default indentation); STATE is the `parse-partial-sexp' state for that position. From ecde0368523614c61d36f3b528afba34152947a3 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 15 Jan 2013 21:11:10 -0500 Subject: [PATCH 05/13] * doc/emacs/trouble.texi (Crashing): Not all addr2line have -p. (Bug#13445) --- doc/emacs/ChangeLog | 2 ++ doc/emacs/trouble.texi | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 16820ee450a..a50ebb7077c 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,5 +1,7 @@ 2013-01-16 Glenn Morris + * trouble.texi (Crashing): Not all addr2line have -p. (Bug#13445) + * custom.texi (Custom Themes): Fix typo. 2013-01-05 Glenn Morris diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index 1d992354c91..81014d7d0d2 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -320,13 +320,14 @@ backtrace with source-code line numbers: @example sed -n 's/.*\[\(.*\)]$/\1/p' @var{backtrace} | - addr2line -Cfip -e @var{bindir}/emacs + addr2line -C -f -i -e @var{bindir}/emacs @end example @noindent Here, @var{backtrace} is the name of a text file containing a copy of the backtrace, and @var{bindir} is the name of the directory that -contains the Emacs executable. +contains the Emacs executable.@footnote{You may wish to add the +@option{-p} option, if your version of @command{addr2line} supports it.} @cindex core dump Optionally, Emacs can generate a @dfn{core dump} when it crashes. A From cfbcc10b457e9ff27474171f0636ba23065ecaa2 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 16 Jan 2013 00:08:34 -0800 Subject: [PATCH 06/13] Backport configure.ac message tweak from trunk --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 8b402f04074..f03d7781671 100644 --- a/configure.ac +++ b/configure.ac @@ -614,7 +614,7 @@ fi AC_ARG_ENABLE([gcc-warnings], [AS_HELP_STRING([--enable-gcc-warnings], - [turn on lots of GCC warnings. This is intended for + [turn on lots of GCC warnings/errors. This is intended for developers, and may generate false alarms when used with older or non-GNU development tools.])], [case $enableval in From 64420fcd992411aac0f36cbbf0559fde9834ab23 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 16 Jan 2013 00:10:18 -0800 Subject: [PATCH 07/13] NEWS tweak --- etc/NEWS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 64d58ebfc48..7ac6c89ebf4 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -32,9 +32,9 @@ features (image support, etc.) that are normally enabled by default. ** New configure option `--enable-gcc-warnings' (for developing/debugging Emacs). If building with GCC, this enables compile-time checks that -warn about possibly-questionable C code. On a recent GNU system there -should be no warnings; on older and on non-GNU systems the generated -warnings may be useful. +warn/give errors about possibly-questionable C code. On a recent GNU +system there should be no warnings; on older and on non-GNU systems +the results may be useful to developers. ** The configure option `--enable-use-lisp-union-type' has been renamed to `--enable-check-lisp-object-type', as the resulting From f1488a0bb09f380e13da41173f9fba93f0bab82c Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 16 Jan 2013 07:17:36 -0500 Subject: [PATCH 08/13] Auto-commit of generated files. --- autogen/configure | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/autogen/configure b/autogen/configure index 35967f530ed..8ad28b1e28a 100755 --- a/autogen/configure +++ b/autogen/configure @@ -2045,9 +2045,10 @@ Optional Features: --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors --disable-largefile omit support for large files - --enable-gcc-warnings turn on lots of GCC warnings. This is intended for - developers, and may generate false alarms when used - with older or non-GNU development tools. + --enable-gcc-warnings turn on lots of GCC warnings/errors. This is + intended for developers, and may generate false + alarms when used with older or non-GNU development + tools. --enable-link-time-optimization build emacs with link-time optimization. This is supported only for GCC since 4.5.0. From 5dfac85d208a010f3261772ccdaa42803dd78bf8 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 16 Jan 2013 07:21:01 -0500 Subject: [PATCH 09/13] Auto-commit of loaddefs files. --- lisp/mail/rmail.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 2524b1939a5..da19b367f1f 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -4607,7 +4607,7 @@ With prefix argument N moves forward N messages with these labels. ;;;*** -;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "1f33964668345a1a1f3119fece148227") +;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "da37981a8295ba2411fdfb77488b1cc3") ;;; Generated autoloads from rmailmm.el (autoload 'rmail-mime "rmailmm" "\ From 085d34c46ae83282b6bd1002ee9fb9be62e76594 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 16 Jan 2013 21:05:16 -0500 Subject: [PATCH 10/13] * src/fns.c (Frandom): Doc fix. --- src/ChangeLog | 4 ++++ src/fns.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index a673c5f6123..64ffe05921f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-01-17 Glenn Morris + + * fns.c (Frandom): Doc fix. + 2013-01-13 Jan Djärv * nsfont.m (LCD_SMOOTHING_MARGIN): New define. diff --git a/src/fns.c b/src/fns.c index cb350df5777..fbb3fb5b161 100644 --- a/src/fns.c +++ b/src/fns.c @@ -66,7 +66,10 @@ and `most-positive-fixnum', inclusive, are equally likely. With positive integer LIMIT, return random number in interval [0,LIMIT). With argument t, set the random number seed from the current time and pid. -Other values of LIMIT are ignored. */) +With a string argument, set the seed based on the string's contents. +Other values of LIMIT are ignored. + +See Info node `(elisp)Random Numbers' for more details. */) (Lisp_Object limit) { EMACS_INT val; From 19503d5abfb9d9c1faa2e6e9e8636623c7667e54 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Wed, 16 Jan 2013 21:07:25 -0500 Subject: [PATCH 11/13] etags.el fix for bug#13412 * lisp/progmodes/etags.el (tags-table-check-computed-list): Preserve point in tags buffer. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/etags.el | 16 ++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c2d869ae827..cd7a013d55c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-01-17 Glenn Morris + + * progmodes/etags.el (tags-table-check-computed-list): + Preserve point in tags buffer. (Bug#13412) + 2013-01-16 Glenn Morris * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix. diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index dc16a2ce762..21844d20598 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -335,12 +335,15 @@ file the tag was in." (save-excursion (tags-verify-table (buffer-file-name table-buffer)))) (with-current-buffer table-buffer - (if (tags-included-tables) - ;; Insert the included tables into the list we - ;; are processing. - (setcdr tables (nconc (mapcar 'tags-expand-table-name - (tags-included-tables)) - (cdr tables))))) + ;; Needed so long as etags-tags-included-tables + ;; does not save-excursion. + (save-excursion + (if (tags-included-tables) + ;; Insert the included tables into the list we + ;; are processing. + (setcdr tables (nconc (mapcar 'tags-expand-table-name + (tags-included-tables)) + (cdr tables)))))) ;; This table is not in core yet. Insert a placeholder ;; saying we must read it into core to check for included ;; tables before searching the next table in the list. @@ -1547,6 +1550,7 @@ hits the start of file." files))) (nreverse files))) +;; FIXME? Should this save-excursion? (defun etags-tags-included-tables () ; Doc string? (let ((files nil) beg) From e17b97778dba7840824c1eb163846fc740d866fb Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Thu, 17 Jan 2013 20:53:34 -0500 Subject: [PATCH 12/13] * doc/emacs/custom.texi (Directory Variables): Fix paren typo. --- doc/emacs/ChangeLog | 4 ++++ doc/emacs/custom.texi | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a50ebb7077c..9471310f252 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2013-01-18 Glenn Morris + + * custom.texi (Directory Variables): Fix paren typo. + 2013-01-16 Glenn Morris * trouble.texi (Crashing): Not all addr2line have -p. (Bug#13445) diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index cff3892635a..fae61252724 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1305,7 +1305,7 @@ files in that subdirectory. @example ((nil . ((indent-tabs-mode . t) (fill-column . 80))) - (c-mode . ((c-file-style . "BSD"))) + (c-mode . ((c-file-style . "BSD") (subdirs . nil))) ("src/imported" . ((nil . ((change-log-default-name From 2fc71e3c45e521a062ea2ab17a4cfe19c3c6f941 Mon Sep 17 00:00:00 2001 From: Leo Liu Date: Sat, 19 Jan 2013 02:35:44 +0800 Subject: [PATCH 13/13] Prune erroneous values in dired-get-marked-files Fixes: debbugs:13152 --- lisp/ChangeLog | 5 +++++ lisp/dired.el | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cd7a013d55c..7be8224ae65 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-01-18 Leo Liu + + * dired.el (dired-get-marked-files): Prune erroneous values due to + last change. (Bug#13152) + 2013-01-17 Glenn Morris * progmodes/etags.el (tags-table-check-computed-list): diff --git a/lisp/dired.el b/lisp/dired.el index 3d01c7b0924..76809f992cc 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -620,12 +620,14 @@ Optional third argument FILTER, if non-nil, is a function to select If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one marked file, return (t FILENAME) instead of (FILENAME). Don't use that together with FILTER." - (let* ((all-of-them - (save-excursion - (dired-map-over-marks - (dired-get-filename localp 'no-error-if-not-filep) - arg nil distinguish-one-marked))) - result) + (let ((all-of-them + (save-excursion + (delq nil (dired-map-over-marks + (dired-get-filename localp 'no-error-if-not-filep) + arg nil distinguish-one-marked)))) + result) + (when (equal all-of-them '(t)) + (setq all-of-them nil)) (if (not filter) (if (and distinguish-one-marked (eq (car all-of-them) t)) all-of-them