diff --git a/ChangeLog b/ChangeLog index cf2d0dc250c..02a0453b9ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-01-19 Glenn Morris + + * Makefile.in (install-arch-indep): Put back a chmod that was + removed 2012-05-19. (Bug#13430) + 2013-01-16 Paul Eggert Merge from gnulib, incorporating: diff --git a/Makefile.in b/Makefile.in index f0342e9bf4c..a2de4f3b164 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}*. diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 1b5bdc8fb53..6e4c9fbc65b 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,11 @@ +2013-01-19 Glenn Morris + + * custom.texi (Directory Variables): Fix paren typo. + + * trouble.texi (Crashing): Not all addr2line have -p. (Bug#13445) + + * custom.texi (Custom Themes): Fix typo. + 2013-01-07 Bastien Guerry * help.texi (Apropos): Document `apropos-user-option' and update diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index 6878af14252..fae61252724 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. @@ -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 diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index de5ed493e63..21ac6af28da 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -325,7 +325,7 @@ backtrace with source-code line numbers: @example sed -n 's/.*\[\(.*\)]$/\1/p' @var{backtrace} | - addr2line -Cfip -e @var{bindir}/@var{emacs-binary} + addr2line -C -f -i -e @var{bindir}/@var{emacs-binary} @end example @noindent @@ -333,7 +333,9 @@ Here, @var{backtrace} is the name of a text file containing a copy of the backtrace, @var{bindir} is the name of the directory that contains the Emacs executable, and @var{emacs-binary} is the name of the Emacs executable file, normally @file{emacs} on GNU and Unix -systems and @file{emacs.exe} on MS-Windows and MS-DOS. +systems and @file{emacs.exe} on MS-Windows and MS-DOS.@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, on diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 851f727621e..111a1594512 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,8 @@ +2013-01-19 Glenn Morris + + * macros.texi (Indenting Macros): Fix order of an indent + symbol's arguments. (Bug#13450) + 2013-01-19 Paul Eggert Allow floating-point file offsets. 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/etc/NEWS b/etc/NEWS index a2e0f41305a..07469e2da07 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -275,9 +275,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 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8d0a61525d9..34dbe74f23f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2013-01-19 Leo Liu + + * dired.el (dired-get-marked-files): Prune erroneous values due to + last change. (Bug#13152) + +2013-01-19 Glenn Morris + + * progmodes/etags.el (tags-table-check-computed-list): + Preserve point in tags buffer. (Bug#13412) + + * emacs-lisp/lisp-mode.el (lisp-indent-function): Doc fix. + 2013-01-19 Christian Wittern (tiny change) Chong Yidong diff --git a/lisp/dired.el b/lisp/dired.el index b8b8a7f877c..30069488586 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 diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 72794c304ea..9c2bd1a29bd 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -1156,7 +1156,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. diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el index 92f9447652e..ff6321d74c3 100644 --- a/lisp/progmodes/etags.el +++ b/lisp/progmodes/etags.el @@ -336,12 +336,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. @@ -1550,6 +1553,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) diff --git a/src/ChangeLog b/src/ChangeLog index 2564e57a825..eb393c93c4a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-01-19 Glenn Morris + + * fns.c (Frandom): Doc fix. + 2013-01-19 Eli Zaretskii * editfns.c (get_pos_property): Use SAFE_ALLOCA_LISP, to avoid diff --git a/src/fns.c b/src/fns.c index 687c3f6ff39..e066d3cbb8f 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;