Now on revision 113938. ------------------------------------------------------------ revno: 113938 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-08-17 20:18:07 +0300 message: Fix a minor issue with loading zlib DLL on MS-Windows. src/decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value of zlib_initialized according to the results of calling init_zlib_functions. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-08-16 22:32:24 +0000 +++ src/ChangeLog 2013-08-17 17:18:07 +0000 @@ -1,3 +1,9 @@ +2013-08-17 Eli Zaretskii + + * decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value + of zlib_initialized according to the results of calling + init_zlib_functions. + 2013-08-16 Lars Magne Ingebrigtsen * image.c: Implement an ImageMagick per-image cache. === modified file 'src/decompress.c' --- src/decompress.c 2013-08-16 05:15:51 +0000 +++ src/decompress.c 2013-08-17 17:18:07 +0000 @@ -116,7 +116,8 @@ else { Lisp_Object status; - status = init_zlib_functions () ? Qt : Qnil; + zlib_initialized = init_zlib_functions (); + status = zlib_initialized ? Qt : Qnil; Vlibrary_cache = Fcons (Fcons (Qzlib_dll, status), Vlibrary_cache); return status; } ------------------------------------------------------------ revno: 113937 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2013-08-17 22:14:41 +0800 message: * text.texi (Case Changes): Fix an `args-out-of-range' error in the example. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-08-17 11:14:10 +0000 +++ doc/lispref/ChangeLog 2013-08-17 14:14:41 +0000 @@ -7,6 +7,7 @@ (Filling): Add cross-reference for hard newlines. (Sorting): Fix indentation. (Columns): Comment out undefined behavior. + (Case Changes): Fix an `args-out-of-range' error in the example. 2013-08-16 Xue Fuqiao === modified file 'doc/lispref/text.texi' --- doc/lispref/text.texi 2013-08-17 10:46:11 +0000 +++ doc/lispref/text.texi 2013-08-17 14:14:41 +0000 @@ -2354,6 +2354,8 @@ For example, if @var{count} is 3, this command adds 3 columns of indentation to each of the lines beginning in the region specified. +@c FIXME: I suggest using message-indent-citation as the example, or +@c just remove this paragraph. --xfq In Mail mode, @kbd{C-c C-y} (@code{mail-yank-original}) uses @code{indent-rigidly} to indent the text copied from the message being replied to. @@ -2531,7 +2533,7 @@ @end group @group -(capitalize-region 1 44) +(capitalize-region 1 37) @result{} nil ---------- Buffer: foo ---------- ------------------------------------------------------------ revno: 113936 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2013-08-17 19:14:10 +0800 message: * doc/lispref/modes.texi (SMIE, SMIE Grammar, SMIE Indentation): Add some indexes. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-08-17 10:46:11 +0000 +++ doc/lispref/ChangeLog 2013-08-17 11:14:10 +0000 @@ -1,5 +1,7 @@ 2013-08-17 Xue Fuqiao + * modes.texi (SMIE, SMIE Grammar, SMIE Indentation): Add some indexes. + * text.texi (Maintaining Undo): Mention interactive call of buffer-disable-undo. (Filling): Add cross-reference for hard newlines. === modified file 'doc/lispref/modes.texi' --- doc/lispref/modes.texi 2013-06-19 13:51:47 +0000 +++ doc/lispref/modes.texi 2013-08-17 11:14:10 +0000 @@ -3381,6 +3381,7 @@ @node SMIE @subsection Simple Minded Indentation Engine +@cindex SMIE SMIE is a package that provides a generic navigation and indentation engine. Based on a very simple parser using an ``operator precedence @@ -3548,6 +3549,8 @@ @node SMIE Grammar @subsubsection Defining the Grammar of a Language +@cindex SMIE grammar +@cindex grammar, SMIE The usual way to define the SMIE grammar of a language is by defining a new global variable that holds the precedence table by @@ -3623,6 +3626,8 @@ @node SMIE Lexer @subsubsection Defining Tokens +@cindex SMIE lexer +@cindex defining tokens, SMIE SMIE comes with a predefined lexical analyzer which uses syntax tables in the following way: any sequence of characters that have word or @@ -3757,6 +3762,7 @@ @node SMIE Indentation @subsubsection Specifying Indentation Rules +@cindex indentation rules, SMIE Based on the provided grammar, SMIE will be able to provide automatic indentation without any extra effort. But in practice, this default ------------------------------------------------------------ revno: 113935 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2013-08-17 18:46:11 +0800 message: * doc/emacs/text.texi (Columns): Comment out undefined behavior. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-08-17 08:04:31 +0000 +++ doc/lispref/ChangeLog 2013-08-17 10:46:11 +0000 @@ -4,6 +4,7 @@ buffer-disable-undo. (Filling): Add cross-reference for hard newlines. (Sorting): Fix indentation. + (Columns): Comment out undefined behavior. 2013-08-16 Xue Fuqiao === modified file 'doc/lispref/text.texi' --- doc/lispref/text.texi 2013-08-17 08:04:31 +0000 +++ doc/lispref/text.texi 2013-08-17 10:46:11 +0000 @@ -2140,9 +2140,12 @@ When called interactively, @var{column} is the value of prefix numeric argument. If @var{column} is not an integer, an error is signaled. +@c This behavior used to be documented until 2013/08. +@ignore If column @var{column} is beyond the end of the line, point moves to the end of the line. If @var{column} is negative, point moves to the beginning of the line. +@end ignore If it is impossible to move to column @var{column} because that is in the middle of a multicolumn character such as a tab, point moves to the ------------------------------------------------------------ revno: 113934 committer: Michael Albinus branch nick: trunk timestamp: Sat 2013-08-17 12:20:15 +0200 message: * net/tramp.el: * net/tramp-adb.el: * net/tramp-cmds.el: * net/tramp-ftp.el: * net/tramp-gvfs.el: * net/tramp-gw.el: * net/tramp-sh.el: Don't wrap external variable declarations by `eval-when-compile'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-08-16 15:17:21 +0000 +++ lisp/ChangeLog 2013-08-17 10:20:15 +0000 @@ -1,3 +1,14 @@ +2013-08-17 Michael Albinus + + * net/tramp.el: + * net/tramp-adb.el: + * net/tramp-cmds.el: + * net/tramp-ftp.el: + * net/tramp-gvfs.el: + * net/tramp-gw.el: + * net/tramp-sh.el: Don't wrap external variable declarations by + `eval-when-compile'. + 2013-08-16 Lars Magne Ingebrigtsen * net/shr.el (shr-rescale-image): Use ImageMagick even for GIFs === modified file 'lisp/net/tramp-adb.el' --- lisp/net/tramp-adb.el 2013-08-15 17:02:09 +0000 +++ lisp/net/tramp-adb.el 2013-08-17 10:20:15 +0000 @@ -37,9 +37,8 @@ (require 'time-date) ;; Pacify byte-compiler. -(eval-when-compile - (defvar directory-sep-char) - (defvar dired-move-to-filename-regexp)) +(defvar directory-sep-char) +(defvar dired-move-to-filename-regexp) (defcustom tramp-adb-program "adb" "Name of the Android Debug Bridge program." === modified file 'lisp/net/tramp-cmds.el' --- lisp/net/tramp-cmds.el 2013-08-16 12:41:17 +0000 +++ lisp/net/tramp-cmds.el 2013-08-17 10:20:15 +0000 @@ -31,9 +31,8 @@ (require 'tramp) ;; Pacify byte-compiler. -(eval-when-compile - (defvar reporter-eval-buffer) - (defvar reporter-prompt-for-summary-p)) +(defvar reporter-eval-buffer) +(defvar reporter-prompt-for-summary-p) (defun tramp-list-tramp-buffers () "Return a list of all Tramp connection buffers." === modified file 'lisp/net/tramp-ftp.el' --- lisp/net/tramp-ftp.el 2013-08-15 17:02:09 +0000 +++ lisp/net/tramp-ftp.el 2013-08-17 10:20:15 +0000 @@ -33,10 +33,10 @@ ;; Pacify byte-compiler. (eval-when-compile (require 'cl) - (require 'custom) - (defvar ange-ftp-ftp-name-arg) - (defvar ange-ftp-ftp-name-res) - (defvar ange-ftp-name-format)) + (require 'custom)) +(defvar ange-ftp-ftp-name-arg) +(defvar ange-ftp-ftp-name-res) +(defvar ange-ftp-name-format) ;; Disable Ange-FTP from file-name-handler-alist. ;; To handle EFS, the following functions need to be dealt with: === modified file 'lisp/net/tramp-gvfs.el' --- lisp/net/tramp-gvfs.el 2013-08-15 17:02:09 +0000 +++ lisp/net/tramp-gvfs.el 2013-08-17 10:20:15 +0000 @@ -107,8 +107,8 @@ ;; Pacify byte-compiler. (eval-when-compile (require 'cl) - (require 'custom) - (defvar ls-lisp-use-insert-directory-program)) + (require 'custom)) +(defvar ls-lisp-use-insert-directory-program) ;;;###tramp-autoload (defcustom tramp-gvfs-methods '("dav" "davs" "obex" "synce") === modified file 'lisp/net/tramp-gw.el' --- lisp/net/tramp-gw.el 2013-08-15 17:02:09 +0000 +++ lisp/net/tramp-gw.el 2013-08-17 10:20:15 +0000 @@ -36,8 +36,8 @@ ;; Pacify byte-compiler. (eval-when-compile (require 'cl) - (require 'custom) - (defvar socks-noproxy)) + (require 'custom)) +(defvar socks-noproxy) ;; We don't add the following methods to `tramp-methods', in order to ;; exclude them from file name completion. === modified file 'lisp/net/tramp-sh.el' --- lisp/net/tramp-sh.el 2013-08-15 17:02:09 +0000 +++ lisp/net/tramp-sh.el 2013-08-17 10:20:15 +0000 @@ -31,10 +31,10 @@ ;; Pacify byte-compiler. (eval-when-compile (require 'cl) - (require 'dired) - (defvar directory-sep-char) - (defvar tramp-gw-tunnel-method) - (defvar tramp-gw-socks-method)) + (require 'dired)) +(defvar directory-sep-char) +(defvar tramp-gw-tunnel-method) +(defvar tramp-gw-socks-method) (defcustom tramp-inline-compress-start-size 4096 "The minimum size of compressing where inline transfer. === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2013-08-15 17:02:09 +0000 +++ lisp/net/tramp.el 2013-08-17 10:20:15 +0000 @@ -61,12 +61,12 @@ ;; Pacify byte-compiler. (eval-when-compile - (require 'cl) - (defvar bkup-backup-directory-info) - (defvar directory-sep-char) - (defvar eshell-path-env) - (defvar file-notify-descriptors) - (defvar outline-regexp)) + (require 'cl)) +(defvar bkup-backup-directory-info) +(defvar directory-sep-char) +(defvar eshell-path-env) +(defvar file-notify-descriptors) +(defvar outline-regexp) ;;; User Customizable Internal Variables: ------------------------------------------------------------ revno: 113933 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2013-08-17 16:04:31 +0800 message: * doc/emacs/text.texi (Sorting): Fix indentation. diff: === modified file 'doc/emacs/glossary.texi' --- doc/emacs/glossary.texi 2013-07-28 22:48:15 +0000 +++ doc/emacs/glossary.texi 2013-08-17 08:04:31 +0000 @@ -873,6 +873,7 @@ which configures Emacs for editing a certain sort of text. Ideally, each programming language has its own major mode. @xref{Major Modes}. +@c FIXME: Mention margins for filling? @item Margin The space between the usable part of a window (including the fringe) and the window edge. === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-08-17 04:31:22 +0000 +++ doc/lispref/ChangeLog 2013-08-17 08:04:31 +0000 @@ -3,6 +3,7 @@ * text.texi (Maintaining Undo): Mention interactive call of buffer-disable-undo. (Filling): Add cross-reference for hard newlines. + (Sorting): Fix indentation. 2013-08-16 Xue Fuqiao === modified file 'doc/lispref/text.texi' --- doc/lispref/text.texi 2013-08-17 04:31:22 +0000 +++ doc/lispref/text.texi 2013-08-17 08:04:31 +0000 @@ -1809,6 +1809,7 @@ @cindex filling, automatic @cindex Auto Fill mode +@c FIXME: I don't think any of the variables below is a/an normal/abnormal hook. Auto Fill mode is a minor mode that fills lines automatically as text is inserted. This section describes the hook used by Auto Fill mode. For a description of functions that you can call explicitly to fill and @@ -1950,10 +1951,10 @@ @group (sort-subr reverse (function - (lambda () - (while (and (not (eobp)) - (looking-at paragraph-separate)) - (forward-line 1)))) + (lambda () + (while (and (not (eobp)) + (looking-at paragraph-separate)) + (forward-line 1)))) 'forward-paragraph) @end group @end example ------------------------------------------------------------ revno: 113932 committer: Xue Fuqiao branch nick: trunk timestamp: Sat 2013-08-17 12:31:22 +0800 message: * doc/emacs/text.texi (Filling): Add cross-reference for hard newlines. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-08-17 00:48:35 +0000 +++ doc/lispref/ChangeLog 2013-08-17 04:31:22 +0000 @@ -2,6 +2,7 @@ * text.texi (Maintaining Undo): Mention interactive call of buffer-disable-undo. + (Filling): Add cross-reference for hard newlines. 2013-08-16 Xue Fuqiao === modified file 'doc/lispref/text.texi' --- doc/lispref/text.texi 2013-08-17 02:45:22 +0000 +++ doc/lispref/text.texi 2013-08-17 04:31:22 +0000 @@ -1613,7 +1613,8 @@ @defvar use-hard-newlines If this variable is non-@code{nil}, the filling functions do not delete newlines that have the @code{hard} text property. These ``hard -newlines'' act as paragraph separators. +newlines'' act as paragraph separators. @xref{Hard and Soft +Newlines,, Hard and Soft Newlines, emacs, The GNU Emacs Manual}. @end defvar @node Margins