Commit 795e7a5b authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-24; up to 2012-12-11T09:51:12Z!dmantipov@yandex.ru

parents 59ac2d13 2fc71e3c
2013-01-19 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-arch-indep): Put back a chmod that was
removed 2012-05-19. (Bug#13430)
2013-01-16 Paul Eggert <eggert@cs.ucla.edu> 2013-01-16 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating: Merge from gnulib, incorporating:
......
...@@ -534,6 +534,7 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR ...@@ -534,6 +534,7 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
tar -xvf - && cat > /dev/null) || exit 1; \ tar -xvf - && cat > /dev/null) || exit 1; \
[ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \ [ "$${dir}" != "${srcdir}/etc" ] || rm -f $${dest}/DOC* ; \
for subdir in `find $${dest} -type d -print` ; do \ for subdir in `find $${dest} -type d -print` ; do \
chmod a+rx $${subdir} ; \
rm -f $${subdir}/.gitignore ; \ rm -f $${subdir}/.gitignore ; \
rm -f $${subdir}/.arch-inventory ; \ rm -f $${subdir}/.arch-inventory ; \
rm -f $${subdir}/.DS_Store ; \ rm -f $${subdir}/.DS_Store ; \
...@@ -568,7 +569,9 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR ...@@ -568,7 +569,9 @@ install-arch-indep: lisp leim install-info install-man ${INSTALL_ARCH_INDEP_EXTR
done ) done )
-chmod -R a+r $(DESTDIR)${datadir}/emacs/${version} ${COPYDESTS} -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 ## We install only the relevant DOC file if possible
## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*. ## (ie DOC-${version}.buildnumber), otherwise DOC-${version}*.
......
2013-01-19 Glenn Morris <rgm@gnu.org>
* 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 <bzg@gnu.org> 2013-01-07 Bastien Guerry <bzg@gnu.org>
* help.texi (Apropos): Document `apropos-user-option' and update * help.texi (Apropos): Document `apropos-user-option' and update
......
...@@ -555,7 +555,7 @@ or disabled as a unit. You can use Custom themes to switch easily ...@@ -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 between various collections of settings, and to transfer such
collections from one computer to another. 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 the Custom theme is @var{name}, the theme file is named
@file{@var{name}-theme.el}. @xref{Creating Custom Themes}, for the @file{@var{name}-theme.el}. @xref{Creating Custom Themes}, for the
format of a theme file and how to make one. format of a theme file and how to make one.
...@@ -1305,7 +1305,7 @@ files in that subdirectory. ...@@ -1305,7 +1305,7 @@ files in that subdirectory.
@example @example
((nil . ((indent-tabs-mode . t) ((nil . ((indent-tabs-mode . t)
(fill-column . 80))) (fill-column . 80)))
(c-mode . ((c-file-style . "BSD"))) (c-mode . ((c-file-style . "BSD")
(subdirs . nil))) (subdirs . nil)))
("src/imported" ("src/imported"
. ((nil . ((change-log-default-name . ((nil . ((change-log-default-name
......
...@@ -325,7 +325,7 @@ backtrace with source-code line numbers: ...@@ -325,7 +325,7 @@ backtrace with source-code line numbers:
@example @example
sed -n 's/.*\[\(.*\)]$/\1/p' @var{backtrace} | 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 @end example
@noindent @noindent
...@@ -333,7 +333,9 @@ Here, @var{backtrace} is the name of a text file containing a copy of ...@@ -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 the backtrace, @var{bindir} is the name of the directory that
contains the Emacs executable, and @var{emacs-binary} is the name of contains the Emacs executable, and @var{emacs-binary} is the name of
the Emacs executable file, normally @file{emacs} on GNU and Unix 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 @cindex core dump
Optionally, Emacs can generate a @dfn{core dump} when it crashes, on Optionally, Emacs can generate a @dfn{core dump} when it crashes, on
......
2013-01-19 Glenn Morris <rgm@gnu.org>
* macros.texi (Indenting Macros): Fix order of an indent
symbol's arguments. (Bug#13450)
2013-01-19 Paul Eggert <eggert@cs.ucla.edu> 2013-01-19 Paul Eggert <eggert@cs.ucla.edu>
Allow floating-point file offsets. Allow floating-point file offsets.
......
...@@ -606,12 +606,12 @@ calculate the indentation of a line within this expression. The ...@@ -606,12 +606,12 @@ calculate the indentation of a line within this expression. The
function receives two arguments: function receives two arguments:
@table @asis @table @asis
@item @var{pos}
The position at which the line being indented begins.
@item @var{state} @item @var{state}
The value returned by @code{parse-partial-sexp} (a Lisp primitive for The value returned by @code{parse-partial-sexp} (a Lisp primitive for
indentation and nesting computation) when it parses up to the indentation and nesting computation) when it parses up to the
beginning of this line. beginning of this line.
@item @var{pos}
The position at which the line being indented begins.
@end table @end table
@noindent @noindent
......
...@@ -275,9 +275,9 @@ features (image support, etc.) that are normally enabled by default. ...@@ -275,9 +275,9 @@ features (image support, etc.) that are normally enabled by default.
** New configure option `--enable-gcc-warnings' (for developing/debugging ** New configure option `--enable-gcc-warnings' (for developing/debugging
Emacs). If building with GCC, this enables compile-time checks that Emacs). If building with GCC, this enables compile-time checks that
warn about possibly-questionable C code. On a recent GNU system there warn/give errors about possibly-questionable C code. On a recent GNU
should be no warnings; on older and on non-GNU systems the generated system there should be no warnings; on older and on non-GNU systems
warnings may be useful. the results may be useful to developers.
** The configure option `--enable-use-lisp-union-type' has been ** The configure option `--enable-use-lisp-union-type' has been
renamed to `--enable-check-lisp-object-type', as the resulting renamed to `--enable-check-lisp-object-type', as the resulting
......
2013-01-19 Leo Liu <sdl.web@gmail.com>
* dired.el (dired-get-marked-files): Prune erroneous values due to
last change. (Bug#13152)
2013-01-19 Glenn Morris <rgm@gnu.org>
* 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 <cwittern@gmail.com> (tiny change) 2013-01-19 Christian Wittern <cwittern@gmail.com> (tiny change)
Chong Yidong <cyd@gnu.org> Chong Yidong <cyd@gnu.org>
   
......
...@@ -620,12 +620,14 @@ Optional third argument FILTER, if non-nil, is a function to select ...@@ -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, If DISTINGUISH-ONE-MARKED is non-nil, then if we find just one marked file,
return (t FILENAME) instead of (FILENAME). return (t FILENAME) instead of (FILENAME).
Don't use that together with FILTER." Don't use that together with FILTER."
(let* ((all-of-them (let ((all-of-them
(save-excursion (save-excursion
(dired-map-over-marks (delq nil (dired-map-over-marks
(dired-get-filename localp 'no-error-if-not-filep) (dired-get-filename localp 'no-error-if-not-filep)
arg nil distinguish-one-marked))) arg nil distinguish-one-marked))))
result) result)
(when (equal all-of-them '(t))
(setq all-of-them nil))
(if (not filter) (if (not filter)
(if (and distinguish-one-marked (eq (car all-of-them) t)) (if (and distinguish-one-marked (eq (car all-of-them) t))
all-of-them all-of-them
......
...@@ -1156,7 +1156,7 @@ is the buffer position of the start of the containing expression." ...@@ -1156,7 +1156,7 @@ is the buffer position of the start of the containing expression."
The function `calculate-lisp-indent' calls this to determine The function `calculate-lisp-indent' calls this to determine
if the arguments of a Lisp function call should be indented specially. 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); Point is located at the point to indent under (for default indentation);
STATE is the `parse-partial-sexp' state for that position. STATE is the `parse-partial-sexp' state for that position.
......
...@@ -336,12 +336,15 @@ file the tag was in." ...@@ -336,12 +336,15 @@ file the tag was in."
(save-excursion (save-excursion
(tags-verify-table (buffer-file-name table-buffer)))) (tags-verify-table (buffer-file-name table-buffer))))
(with-current-buffer table-buffer (with-current-buffer table-buffer
(if (tags-included-tables) ;; Needed so long as etags-tags-included-tables
;; Insert the included tables into the list we ;; does not save-excursion.
;; are processing. (save-excursion
(setcdr tables (nconc (mapcar 'tags-expand-table-name (if (tags-included-tables)
(tags-included-tables)) ;; Insert the included tables into the list we
(cdr tables))))) ;; 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 ;; This table is not in core yet. Insert a placeholder
;; saying we must read it into core to check for included ;; saying we must read it into core to check for included
;; tables before searching the next table in the list. ;; tables before searching the next table in the list.
...@@ -1550,6 +1553,7 @@ hits the start of file." ...@@ -1550,6 +1553,7 @@ hits the start of file."
files))) files)))
(nreverse files))) (nreverse files)))
;; FIXME? Should this save-excursion?
(defun etags-tags-included-tables () ; Doc string? (defun etags-tags-included-tables () ; Doc string?
(let ((files nil) (let ((files nil)
beg) beg)
......
2013-01-19 Glenn Morris <rgm@gnu.org>
* fns.c (Frandom): Doc fix.
2013-01-19 Eli Zaretskii <eliz@gnu.org> 2013-01-19 Eli Zaretskii <eliz@gnu.org>
   
* editfns.c (get_pos_property): Use SAFE_ALLOCA_LISP, to avoid * editfns.c (get_pos_property): Use SAFE_ALLOCA_LISP, to avoid
......
...@@ -66,7 +66,10 @@ and `most-positive-fixnum', inclusive, are equally likely. ...@@ -66,7 +66,10 @@ and `most-positive-fixnum', inclusive, are equally likely.
With positive integer LIMIT, return random number in interval [0,LIMIT). 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. 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) (Lisp_Object limit)
{ {
EMACS_INT val; EMACS_INT val;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment