------------------------------------------------------------ revno: 116544 committer: Paul Eggert branch nick: trunk timestamp: Sun 2014-02-23 23:12:42 -0800 message: Merge from gnulib. 2014-02-21 timer: fix uClibc detection of threading 2014-02-21 maintainer-makefiles: provide AC_PROG_SED for older autoconf * texinfo.tex: Update from gnulib. diff: === modified file 'ChangeLog' --- ChangeLog 2014-02-18 01:47:35 +0000 +++ ChangeLog 2014-02-24 07:12:42 +0000 @@ -1,3 +1,9 @@ +2014-02-24 Paul Eggert + + Merge from gnulib, incorporating: + 2014-02-21 timer: fix uClibc detection of threading + 2014-02-21 maintainer-makefiles: provide AC_PROG_SED for older autoconf + 2014-02-18 Mirek Kaim (tiny change) * configure.ac [HAVE_W32]: Test for ImageMagick. (Bug#16754) === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2014-02-22 23:14:49 +0000 +++ doc/misc/ChangeLog 2014-02-24 07:12:42 +0000 @@ -1,3 +1,7 @@ +2014-02-24 Paul Eggert + + * texinfo.tex: Update from gnulib. + 2014-02-22 Xue Fuqiao * remember.texi (Quick Start): Add an index. === modified file 'doc/misc/texinfo.tex' --- doc/misc/texinfo.tex 2014-02-12 22:09:31 +0000 +++ doc/misc/texinfo.tex 2014-02-24 07:12:42 +0000 @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2014-02-09.15} +\def\texinfoversion{2014-02-16.16} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -4428,7 +4428,7 @@ % complicated, when \tex is in effect and \{ is a \delimiter again. % We can't use \lbracecmd and \rbracecmd because texindex assumes % braces and backslashes are used only as delimiters. Perhaps we - % should define @lbrace and @rbrace commands a la @comma. + % should use @lbracechar and @rbracechar? \def\{{{\tt\char123}}% \def\}{{\tt\char125}}% % @@ -4449,8 +4449,7 @@ % @end macro % ... % @funindex commtest - % - % The above is not enough to reproduce the bug, but it gives the flavor. + % This is not enough to reproduce the bug, but it gives the flavor. % % Sample whatsit resulting: % .@write3{\entry{xyz}{@folio }{@code {xyz@endinput }}} @@ -4663,6 +4662,9 @@ \let\xeatspaces = \eatspaces } +% For testing: output @{ and @} in index sort strings as \{ and \}. +\newif\ifusebracesinindexes + % \indexnofonts is used when outputting the strings to sort the index % by, and when constructing control sequence names. It eliminates all % control sequences and just writes whatever the best ASCII sort string @@ -4691,11 +4693,16 @@ % Unfortunately, texindex is not prepared to handle braces in the % content at all. So for index sorting, we map @{ and @} to strings % starting with |, since that ASCII character is between ASCII { and }. - \def\{{|a}% - \def\lbracechar{|a}% + \ifusebracesinindexes + \def\lbracechar{\lbracecmd}% + \def\rbracechar{\rbracecmd}% + \else + \def\lbracechar{|a}% + \def\rbracechar{|b}% + \fi + \let\{=\lbracechar + \let\}=\rbracechar % - \def\}{|b}% - \def\rbracechar{|b}% % % Non-English letters. \def\AA{AA}% === modified file 'm4/gnulib-common.m4' --- m4/gnulib-common.m4 2014-01-11 07:01:30 +0000 +++ m4/gnulib-common.m4 2014-02-24 07:12:42 +0000 @@ -379,3 +379,59 @@ # AS_VAR_COPY was added in autoconf 2.63b m4_define_default([AS_VAR_COPY], [AS_LITERAL_IF([$1[]$2], [$1=$$2], [eval $1=\$$2])]) + +# AC_PROG_SED was added in autoconf 2.59b +m4_ifndef([AC_PROG_SED], +[AC_DEFUN([AC_PROG_SED], +[AC_CACHE_CHECK([for a sed that does not truncate output], ac_cv_path_SED, + [dnl ac_script should not contain more than 99 commands (for HP-UX sed), + dnl but more than about 7000 bytes, to catch a limit in Solaris 8 /usr/ucb/sed. + ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/ + for ac_i in 1 2 3 4 5 6 7; do + ac_script="$ac_script$as_nl$ac_script" + done + echo "$ac_script" 2>/dev/null | sed 99q >conftest.sed + AS_UNSET([ac_script]) + if test -z "$SED"; then + ac_path_SED_found=false + _AS_PATH_WALK([], [ + for ac_prog in sed gsed; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" + AS_EXECUTABLE_P(["$ac_path_SED"]) || continue + case `"$ac_path_SED" --version 2>&1` in + *GNU*) ac_cv_path_SED=$ac_path_SED ac_path_SED_found=:;; + *) + ac_count=0 + _AS_ECHO_N([0123456789]) >conftest.in + while : + do + cat conftest.in conftest.in >conftest.tmp + mv conftest.tmp conftest.in + cp conftest.in conftest.nl + echo >> conftest.nl + "$ac_path_SED" -f conftest.sed conftest.out 2>/dev/null || break + diff conftest.out conftest.nl >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_SED_max-0}; then + # Best so far, but keep looking for better + ac_cv_path_SED=$ac_path_SED + ac_path_SED_max=$ac_count + fi + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; + esac + $ac_path_SED_found && break 3 + done + done]) + if test -z "$ac_cv_path_SED"; then + AC_ERROR([no acceptable sed could be found in \$PATH]) + fi + else + ac_cv_path_SED=$SED + fi + SED="$ac_cv_path_SED" + AC_SUBST([SED])dnl + rm -f conftest.sed +])])]) === modified file 'm4/timer_time.m4' --- m4/timer_time.m4 2014-01-01 07:43:34 +0000 +++ m4/timer_time.m4 2014-02-24 07:12:42 +0000 @@ -28,7 +28,7 @@ #include #ifdef __GNU_LIBRARY__ #if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || (__GLIBC__ > 2)) \ - && !defined __UCLIBC__ + && !(__UCLIBC__ && __HAS_NO_THREADS__) Thread emulation available #endif #endif ------------------------------------------------------------ revno: 116543 committer: Leo Liu branch nick: trunk timestamp: Mon 2014-02-24 11:55:17 +0800 message: * emacs-lisp/easy-mmode.el (define-minor-mode): Fix debug spec. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-24 02:38:54 +0000 +++ lisp/ChangeLog 2014-02-24 03:55:17 +0000 @@ -1,3 +1,7 @@ +2014-02-24 Leo Liu + + * emacs-lisp/easy-mmode.el (define-minor-mode): Fix debug spec. + 2014-02-24 Juanma Barranquero * apropos.el (apropos-print): Avoid formatting error when === modified file 'lisp/emacs-lisp/easy-mmode.el' --- lisp/emacs-lisp/easy-mmode.el 2014-01-01 07:43:34 +0000 +++ lisp/emacs-lisp/easy-mmode.el 2014-02-24 03:55:17 +0000 @@ -148,7 +148,7 @@ :lighter \" Foo\" :require 'foo :global t :group 'hassle :version \"27.5\" ...BODY CODE...)" (declare (doc-string 2) - (debug (&define name stringp + (debug (&define name string-or-null-p [&optional [¬ keywordp] sexp &optional [¬ keywordp] sexp &optional [¬ keywordp] sexp] ------------------------------------------------------------ revno: 116542 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2014-02-24 03:38:54 +0100 message: lisp/apropos.el: Avoid formatting error in compact layout mode. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-23 23:41:17 +0000 +++ lisp/ChangeLog 2014-02-24 02:38:54 +0000 @@ -1,3 +1,8 @@ +2014-02-24 Juanma Barranquero + + * apropos.el (apropos-print): Avoid formatting error when + apropos-do-all and apropos-compact-layout are both t. + 2014-02-23 Juanma Barranquero * apropos.el (apropos-property, apropos-all-words-regexp) === modified file 'lisp/apropos.el' --- lisp/apropos.el 2014-02-23 23:41:17 +0000 +++ lisp/apropos.el 2014-02-24 02:38:54 +0000 @@ -1052,6 +1052,7 @@ (let ((p apropos-accumulator) (old-buffer (current-buffer)) (inhibit-read-only t) + (button-end 0) symbol item) (set-buffer standard-output) (apropos-mode) @@ -1069,10 +1070,12 @@ (setq apropos-item (cons (car apropos-item) (cons nil (cdr apropos-item))))) + (when (= (point) button-end) (terpri)) (insert-text-button (symbol-name symbol) 'type 'apropos-symbol 'skip apropos-multi-type 'face 'apropos-symbol) + (setq button-end (point)) (if (and (eq apropos-sort-by-scores 'verbose) (cadr apropos-item)) (insert " (" (number-to-string (cadr apropos-item)) ") ")) ------------------------------------------------------------ revno: 116541 committer: Juanma Barranquero branch nick: trunk timestamp: Mon 2014-02-24 00:41:17 +0100 message: lisp/apropos: Fix typos. (apropos-property, apropos-all-words-regexp) (apropos-true-hit, apropos-variable, apropos-print): Fix docstring typos, and remove obsolete comment. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-23 14:51:29 +0000 +++ lisp/ChangeLog 2014-02-23 23:41:17 +0000 @@ -1,3 +1,9 @@ +2014-02-23 Juanma Barranquero + + * apropos.el (apropos-property, apropos-all-words-regexp) + (apropos-true-hit, apropos-variable, apropos-print): + Fix docstring typos, and remove obsolete comment. + 2014-02-23 Michael Albinus * net/tramp-sh.el (tramp-sh-handle-file-truename): === modified file 'lisp/apropos.el' --- lisp/apropos.el 2014-02-13 05:23:06 +0000 +++ lisp/apropos.el 2014-02-23 23:41:17 +0000 @@ -99,7 +99,7 @@ (defface apropos-property '((t (:inherit font-lock-builtin-face))) - "Face for property name in apropos output, or nil for none." + "Face for property name in Apropos output, or nil for none." :group 'apropos :version "24.3") @@ -182,7 +182,7 @@ "Regexp used in current apropos run.") (defvar apropos-all-words-regexp nil - "Regexp matching apropos-all-words.") + "Regexp matching `apropos-all-words'.") (defvar apropos-files-scanned () "List of elc files already scanned in current run of `apropos-documentation'.") @@ -411,7 +411,6 @@ apropos-pattern pattern apropos-regexp pattern))) - (defun apropos-calc-scores (str words) "Return apropos scores for string STR matching WORDS. Value is a list of offsets of the words into the string." @@ -455,7 +454,7 @@ (defun apropos-true-hit (str words) "Return t if STR is a genuine hit. This may fail if only one of the keywords is matched more than once. -This requires that at least 2 keywords (unless only one was given)." +This requires at least two keywords (unless only one was given)." (or (not str) (not words) (not (cdr words)) @@ -506,7 +505,7 @@ ;;;###autoload (defun apropos-variable (pattern &optional do-not-all) "Show variables that match PATTERN. -When DO-NOT-ALL is not-nil, show user options only, i.e. behave +When DO-NOT-ALL is non-nil, show user options only, i.e. behave like `apropos-user-option'." (interactive (list (apropos-read-pattern (if current-prefix-arg "user option" "variable")) @@ -1038,14 +1037,12 @@ `apropos-accumulator' to nil before returning. If SPACING is non-nil, it should be a string; separate items with that string. -If non-nil TEXT is a string that will be printed as a heading." +If non-nil, TEXT is a string that will be printed as a heading." (if (null apropos-accumulator) (message "No apropos matches for `%s'" apropos-pattern) (setq apropos-accumulator (sort apropos-accumulator (lambda (a b) - ;; Don't sort by score if user can't see the score. - ;; It would be confusing. -- rms. (if apropos-sort-by-scores (or (> (cadr a) (cadr b)) (and (= (cadr a) (cadr b)) ------------------------------------------------------------ revno: 116540 committer: Juanma Barranquero branch nick: trunk timestamp: Sun 2014-02-23 20:46:38 +0100 message: etc/NEWS: Fix some mangled references to U+00AB and U+00BB. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-02-09 04:24:02 +0000 +++ etc/ChangeLog 2014-02-23 19:46:38 +0000 @@ -1,3 +1,7 @@ +2014-02-23 Juanma Barranquero + + * NEWS: Fix references to ?« and ?» that got mangled somehow. + 2014-02-09 Lars Ingebrigtsen * NEWS: Mention all the Apropos face options that have been === modified file 'etc/NEWS' --- etc/NEWS 2014-02-23 19:23:12 +0000 +++ etc/NEWS 2014-02-23 19:46:38 +0000 @@ -1063,8 +1063,8 @@ ** `defvar' and `defcustom' in a let-binding affect the "external" default. --- -** The syntax of ?» and ?« is now punctuation instead of matched parens. -Some languages match those as »...«, and others as «...», so it is +** The syntax of ?» and ?« is now punctuation instead of matched parens. +Some languages match those as »...«, and others as «...», so it is better for Emacs to stay neutral by default. --- ------------------------------------------------------------ revno: 116539 committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-02-23 11:25:59 -0800 message: Fix typo in previous diff: === modified file 'doc/emacs/rmail.texi' --- doc/emacs/rmail.texi 2014-02-23 19:23:12 +0000 +++ doc/emacs/rmail.texi 2014-02-23 19:25:59 +0000 @@ -356,7 +356,7 @@ @item The inbox file format varies between operating systems and according to the other mail software in use. Only one part of Rmail needs to know -about the alternatives, and it need only understand how to convert allx +about the alternatives, and it need only understand how to convert all of them to Rmail's own format. @item ------------------------------------------------------------ revno: 116538 committer: Glenn Morris branch nick: trunk timestamp: Sun 2014-02-23 11:23:12 -0800 message: * doc/emacs/rmail.texi (Rmail Inbox): Mention rmail-mbox-format. * etc/NEWS: Related markup. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2014-02-20 08:25:12 +0000 +++ doc/emacs/ChangeLog 2014-02-23 19:23:12 +0000 @@ -1,3 +1,7 @@ +2014-02-23 Glenn Morris + + * rmail.texi (Rmail Inbox): Mention rmail-mbox-format. + 2014-02-20 Glenn Morris * search.texi (Special Isearch): Mention invisible text. === modified file 'doc/emacs/rmail.texi' --- doc/emacs/rmail.texi 2014-01-01 07:43:34 +0000 +++ doc/emacs/rmail.texi 2014-02-23 19:23:12 +0000 @@ -356,7 +356,7 @@ @item The inbox file format varies between operating systems and according to the other mail software in use. Only one part of Rmail needs to know -about the alternatives, and it need only understand how to convert all +about the alternatives, and it need only understand how to convert allx of them to Rmail's own format. @item @@ -369,12 +369,20 @@ @end enumerate @c FIXME remove this in Emacs 25; won't be relevant any more. +@cindex Babyl files +@cindex mbox files Rmail was originally written to use the Babyl format as its internal format. Since then, we have recognized that the usual inbox format (@samp{mbox}) on Unix and GNU systems is adequate for the job, and so since Emacs 23 Rmail uses that as its internal format. The Rmail file is still separate from the inbox file, even though their format is the same. +@c But this bit should stay in some form. +@vindex rmail-mbox-format +(In fact, there are a few slightly different mbox formats. +The differences are not very important, but you can set the variable +@code{rmail-mbox-format} to tell Rmail which form your system uses. +See that variable's documentation for more details.) @vindex rmail-preserve-inbox When getting new mail, Rmail first copies the new mail from the === modified file 'etc/NEWS' --- etc/NEWS 2014-02-23 10:32:14 +0000 +++ etc/NEWS 2014-02-23 19:23:12 +0000 @@ -784,6 +784,7 @@ ** Rmail ++++ *** Customize `rmail-mbox-format' to influence some minor aspects of how Rmail displays non-MIME messages. ------------------------------------------------------------ revno: 116537 fixes bug: http://debbugs.gnu.org/16851 committer: Michael Albinus branch nick: trunk timestamp: Sun 2014-02-23 15:51:29 +0100 message: * net/tramp-sh.el (tramp-sh-handle-file-truename): Preserve trailing "/". diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-23 08:26:40 +0000 +++ lisp/ChangeLog 2014-02-23 14:51:29 +0000 @@ -1,3 +1,8 @@ +2014-02-23 Michael Albinus + + * net/tramp-sh.el (tramp-sh-handle-file-truename): + Preserve trailing "/". (Bug#16851) + 2014-02-23 Dmitry Gutov * progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially @@ -130,7 +135,7 @@ (tramp-handle-insert-directory): New defun, taken from tramp-gvfs.el. * net/tramp-gvfs.el (tramp-gvfs-file-name-handler-alist) - : Use `tramp-handle-insert-directory. + : Use `tramp-handle-insert-directory'. (tramp-gvfs-handle-insert-directory): Remove function. * net/tramp-sh.el (tramp-sh-handle-insert-directory): === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2014-02-20 14:24:13 +0000 +++ lisp/net/tramp-sh.el 2014-02-23 14:51:29 +0000 @@ -1042,7 +1042,8 @@ (setq result (concat result "/")))))) (tramp-message v 4 "True name of `%s' is `%s'" localname result) - result))))) + (if (string-equal (file-name-nondirectory localname) "") + (file-name-as-directory result) result)))))) ;; Basic functions. ------------------------------------------------------------ revno: 116536 committer: martin rudalics branch nick: trunk timestamp: Sun 2014-02-23 11:32:14 +0100 message: Fix some marks in NEWS. diff: === modified file 'etc/NEWS' --- etc/NEWS 2014-02-22 21:49:10 +0000 +++ etc/NEWS 2014-02-23 10:32:14 +0000 @@ -219,31 +219,26 @@ two are useful to provide a 3D effect, or to better distinguish dividers from surrounding display objects. ---- *** New functions are provided to return the pixel sizes of window components, namely `window-scroll-bar-width', `window-mode-line-height' `window-header-line-height', `window-right-divider-width' and `window-bottom-divider-width'. ---- *** The new function `window-text-pixel-size' returns the size of the text of a window's buffer in pixels. This allows functions like `fit-frame-to-buffer' and `fit-window-to-buffer' to accurately fit a window to its buffer as it will be displayed. ---- *** `fit-window-to-buffer' can now resize windows horizontally. This behavior is controlled by the new option `fit-window-to-buffer-horizontally'. ---- *** `fit-frame-to-buffer' can now fit frames in both directions. This behavior is controlled by the option `fit-frame-to-buffer' which tells in which direction(s) the frame shall be fit. The new options `fit-frame-to-buffer-margins' and `fit-frame-to-buffer-sizes' allow to control the size of the frame and its position on screen. ---- *** Temp Buffer Resize Mode can now adjust height and width of windows and frames. `temp-buffer-resize-mode' is now able to adjust the height and the width of a window displaying a temporary buffer. The new option @@ -258,11 +253,9 @@ and as such superfluous. After being reimplemented in Lisp, its interactive form was mistakenly retained. ---- *** The functions `window-size' and `window-total-size' now have an optional argument to return a rounded size value. ---- *** `window-state-put' now allows to put a window state into internal windows too. @@ -272,12 +265,10 @@ using the scroll bar (i.e. dragging the thumb down even when the end of the buffer is visible). ---- *** New basic action function `display-buffer-in-previous-window' has `display-buffer' display a buffer in a window previously showing that buffer. ---- *** New basic action function `display-buffer-at-bottom' has `display-buffer' choose or make a window at the bottom of the selected frame. ------------------------------------------------------------ revno: 116535 committer: Dmitry Gutov branch nick: trunk timestamp: Sun 2014-02-23 10:26:40 +0200 message: * lisp/progmodes/ruby-mode.el (ruby-smie-rules): Handle the inconsistent second element of the list returned by `smie-indent--parent'. (ruby-font-lock-keywords): Disqualify any identifier before `=' as method call. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-02-23 05:53:53 +0000 +++ lisp/ChangeLog 2014-02-23 08:26:40 +0000 @@ -2,6 +2,10 @@ * progmodes/ruby-mode.el (ruby-smie-rules): Don't indent specially after `=>' (bug#16811). + (ruby-smie-rules): Handle the inconsistent second element of the + list returned by `smie-indent--parent'. + (ruby-font-lock-keywords): Disqualify any identifier before `=' as + method call. 2014-02-23 Juanma Barranquero === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2014-02-23 05:53:53 +0000 +++ lisp/progmodes/ruby-mode.el 2014-02-23 08:26:40 +0000 @@ -630,9 +630,11 @@ (save-excursion ;; Traverse up the parents until the parent is "." at ;; indentation, or any other token. - (while (and (progn - (goto-char (1- (cadr (smie-indent--parent)))) - (not (ruby-smie--bosp))) + (while (and (let ((parent (smie-indent--parent))) + (goto-char (cadr parent)) + (save-excursion + (unless (integerp (car parent)) (forward-char -1)) + (not (ruby-smie--bosp)))) (progn (setq smie--parent nil) (smie-rule-parent-p ".")))) @@ -2061,7 +2063,7 @@ "refine" "using") 'symbols)) - (1 (unless (looking-at " *\\(?:[]|,.)}]\\|$\\)") + (1 (unless (looking-at " *\\(?:[]|,.)}=]\\|$\\)") font-lock-builtin-face))) ;; Kernel methods that have no required arguments. (,(concat === modified file 'test/indent/ruby.rb' --- test/indent/ruby.rb 2014-02-23 05:53:53 +0000 +++ test/indent/ruby.rb 2014-02-23 08:26:40 +0000 @@ -357,6 +357,13 @@ .lose( q, p) +a.records().map(&:b).zip( + foo) + +# FIXME: This is not consistent with the example below it, but this +# ofset only happens if the colon is at eol, which wouldn't be often. +# Tokenizing `bar:' as `:bar =>' would be better, but it's hard to +# distinguish from a variable reference inside a ternary operator. foo(bar: tee)