diff options
31 files changed, 118 insertions, 122 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 824c1bbb9c..7c9e48b139 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -1,3 +1,7 @@ +2012-06-11 Chong Yidong <[email protected]> + + * emacs.texi: Remove urlcolor setting. + 2012-06-10 Chong Yidong <[email protected]> * emacs.texi: Update ISBN and edition number. diff --git a/doc/emacs/anti.texi b/doc/emacs/anti.texi index 32b4cd08a0..a2309a9919 100644 --- a/doc/emacs/anti.texi +++ b/doc/emacs/anti.texi @@ -71,9 +71,10 @@ modes, such as Shell mode, now implement their own inline completion commands instead of using @code{completion-at-point}. @item -We have removed various options for controlling how windows are used, -e.g.@: @code{display-buffer-base-action}, @code{display-buffer-alist}, -@code{window-combination-limit}, and @code{window-combination-resize}. +We have removed several options for controlling how windows are used, +such as @code{display-buffer-base-action}, +@code{display-buffer-alist}, @code{window-combination-limit}, and +@code{window-combination-resize}. @item The command @kbd{M-x customize-themes} has been removed. Emacs no diff --git a/doc/emacs/building.texi b/doc/emacs/building.texi index aa2634d357..064f18dd46 100644 --- a/doc/emacs/building.texi +++ b/doc/emacs/building.texi @@ -1495,7 +1495,7 @@ eval-buffer} is similar but evaluates the entire buffer. @vindex eval-expression-print-level @vindex eval-expression-print-length @vindex eval-expression-debug-on-error - The customizable variables @code{eval-expression-print-level} and + The options @code{eval-expression-print-level} and @code{eval-expression-print-length} control the maximum depth and length of lists to print in the result of the evaluation commands before abbreviating them. @code{eval-expression-debug-on-error} diff --git a/doc/emacs/calendar.texi b/doc/emacs/calendar.texi index e55d40767f..ff00df58c4 100644 --- a/doc/emacs/calendar.texi +++ b/doc/emacs/calendar.texi @@ -245,10 +245,10 @@ Scroll calendar one month forward (@code{calendar-scroll-left}). Scroll calendar one month backward (@code{calendar-scroll-right}). @item C-v @itemx @key{next} -Scroll three months forward (@code{calendar-scroll-left-three-months}). +Scroll forward by three months (@code{calendar-scroll-left-three-months}). @item M-v @itemx @key{prior} -Scroll three months backward (@code{calendar-scroll-right-three-months}). +Scroll backward by three months (@code{calendar-scroll-right-three-months}). @end table @kindex > @r{(Calendar mode)} diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index a2d90880ef..91cb0786a8 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi @@ -577,8 +577,8 @@ does not use @env{TZ} at all. The user's login name. See also @env{LOGNAME}. On MS-DOS, this defaults to @samp{root}. @item VERSION_CONTROL -Used to initialize the @code{version-control} Lisp variable -(@pxref{Backup Names}). +Used to initialize the @code{version-control} variable (@pxref{Backup +Names}). @end table @node Misc Variables diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index de239c6afb..b6a82ed388 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -1052,13 +1052,13 @@ pair with a colon and semicolon. The special variable/value pair @findex add-file-local-variable-prop-line @findex delete-file-local-variable-prop-line @findex copy-dir-locals-to-file-locals-prop-line - You can use the command @kbd{M-x add-file-local-variable-prop-line} -instead of adding entries by hand. This command prompts for a -variable and value, and adds them to the first line in the appropriate -way. The command @kbd{M-x delete-file-local-variable-prop-line} -prompts for a variable, and deletes its entry from the line. The -command @kbd{M-x copy-dir-locals-to-file-locals-prop-line} copies the -current directory-local variables to the first line (@pxref{Directory + You can use @kbd{M-x add-file-local-variable-prop-line} instead of +adding entries by hand. This command prompts for a variable and +value, and adds them to the first line in the appropriate way. +@kbd{M-x delete-file-local-variable-prop-line} prompts for a variable, +and deletes its entry from the line. The command @kbd{M-x +copy-dir-locals-to-file-locals-prop-line} copies the current +directory-local variables to the first line (@pxref{Directory Variables}). Here is an example first line that specifies Lisp mode and sets two diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 4b8717292e..aaeeda24d4 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -54,7 +54,7 @@ developing GNU and promoting software freedom.'' @c in general, keep the following line commented out, unless doing a @c copy of this manual that will be published. The manual should go @c onto the distribution in the full, 8.5 x 11" size. -@c @smallbook +@c @set smallbook @ifset smallbook @smallbook @@ -66,8 +66,6 @@ developing GNU and promoting software freedom.'' @tex @ifset smallbook @fonttextsize 10 -\global\let\urlcolor=\Black % don't print links in grayscale -\global\let\linkcolor=\Black @end ifset \global\hbadness=6666 % don't worry about not-too-underfull boxes @end tex diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi index d4939da0b0..cf276c44d0 100644 --- a/doc/emacs/frames.texi +++ b/doc/emacs/frames.texi @@ -668,7 +668,7 @@ The font slant---normally @samp{r} (roman), @samp{i} (italic), @samp{o} (oblique), @samp{ri} (reverse italic), or @samp{ot} (other). Some font names support other values. @item widthtype -The font width---normally one of @samp{normal}, @samp{condensed}, +The font width---normally @samp{normal}, @samp{condensed}, @samp{semicondensed}, or @samp{extended}. Some font names support other values. @item style diff --git a/doc/emacs/maintaining.texi b/doc/emacs/maintaining.texi index b0ee5bd5f2..32f49d92ce 100644 --- a/doc/emacs/maintaining.texi +++ b/doc/emacs/maintaining.texi @@ -903,11 +903,11 @@ Display the changes that will be sent by the next push operation @kindex C-x v l @findex vc-print-log - The command @kbd{C-x v l} (@code{vc-print-log}) displays a buffer -named @file{*vc-change-log*}, showing the history of changes made to -the current file, including who made the changes, the dates, and the -log entry for each change (these are the same log entries you would -enter via the @file{*vc-log*} buffer; @pxref{Log Buffer}). Point is + @kbd{C-x v l} (@code{vc-print-log}) displays a buffer named +@file{*vc-change-log*}, showing the history of changes made to the +current file, including who made the changes, the dates, and the log +entry for each change (these are the same log entries you would enter +via the @file{*vc-log*} buffer; @pxref{Log Buffer}). Point is centered at the revision of the file currently being visited. With a prefix argument, the command prompts for the revision to center on, and the maximum number of revisions to display. diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index ad46f65b6d..45689409bb 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -2257,18 +2257,18 @@ editors. Standard facilities can emulate these: @cindex Brief emulation @cindex emulation of Brief @cindex mode, CRiSP -You can turn on key bindings to emulate the CRiSP/Brief editor with -@kbd{M-x crisp-mode}. Note that this rebinds @kbd{M-x} to exit Emacs -unless you set the variable @code{crisp-override-meta-x}. You can -also use the command @kbd{M-x scroll-all-mode} or set the variable +@kbd{M-x crisp-mode} enables key bindings to emulate the CRiSP/Brief +editor. Note that this rebinds @kbd{M-x} to exit Emacs unless you set +the variable @code{crisp-override-meta-x}. You can also use the +command @kbd{M-x scroll-all-mode} or set the variable @code{crisp-load-scroll-all} to emulate CRiSP's scroll-all feature (scrolling all windows together). @item EDT (DEC VMS editor) @findex edt-emulation-on @findex edt-emulation-off -Turn on EDT emulation @kbd{M-x edt-emulation-on}; use @kbd{M-x -edt-emulation-off} to restore normal Emacs command bindings. +Turn on EDT emulation with @kbd{M-x edt-emulation-on}; restore normal +command bindings with @kbd{M-x edt-emulation-off}. Most of the EDT emulation commands are keypad keys, and most standard Emacs key bindings are still available. The EDT emulation rebindings @@ -2481,8 +2481,8 @@ find the one you select (@code{ffap-menu}). @findex animate-birthday-present @cindex animate - The @code{animate} package makes text dance; for example, try -@kbd{M-x animate-birthday-present}. + The @code{animate} package makes text dance (e.g. @kbd{M-x +animate-birthday-present}). @findex blackbox @findex mpuz diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 96a919cfaf..b3ce825c88 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi @@ -415,16 +415,15 @@ names, which might cause misalignment of columns in Dired display. @section HOME and Startup Directories on MS-Windows @cindex @code{HOME} directory on MS-Windows - The Windows equivalent of the @code{HOME} directory is the -@dfn{user-specific application data directory}. The actual location -depends on the Windows version; typical values are @file{C:\Documents -and Settings\@var{username}\Application Data} on Windows 2K/XP/2K3, -@file{C:\Users\@var{username}\AppData\Roaming} on Windows Vista/7/2K8, -and either @file{C:\WINDOWS\Application Data} or -@file{C:\WINDOWS\Profiles\@var{username}\Application Data} on the -older Windows 9X/ME systems. If this directory does not exist or -cannot be accessed, Emacs falls back to @file{C:\} as the default -value of @code{HOME}. + The Windows equivalent of @code{HOME} is the @dfn{user-specific +application data directory}. The actual location depends on the +Windows version; typical values are @file{C:\Documents and +Settings\@var{username}\Application Data} on Windows 2000/XP/2K3, +@file{C:\Users\@var{username}\AppData\Roaming} on Windows +Vista/7/2008, and either @file{C:\WINDOWS\Application Data} or +@file{C:\WINDOWS\Profiles\@var{username}\Application Data} on Windows +9X/ME. If this directory does not exist or cannot be accessed, Emacs +falls back to @file{C:\} as the default value of @code{HOME}. You can override this default value of @code{HOME} by explicitly setting the environment variable @env{HOME} to point to any directory diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index c99d44191e..fd47401252 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -1015,11 +1015,11 @@ Both accept numeric arguments as repeat counts. @kindex C-c C-f @r{(Outline mode)} @kindex C-c C-b @r{(Outline mode)} @kindex C-c C-u @r{(Outline mode)} - The commands @kbd{C-c C-f} (@code{outline-forward-same-level}) and -@kbd{C-c C-b} (@code{outline-backward-same-level}) move from one -heading line to another visible heading at the same depth in the -outline. @kbd{C-c C-u} (@code{outline-up-heading}) moves backward to -another heading that is less deeply nested. + @kbd{C-c C-f} (@code{outline-forward-same-level}) and @kbd{C-c C-b} +(@code{outline-backward-same-level}) move from one heading line to +another visible heading at the same depth in the outline. @kbd{C-c +C-u} (@code{outline-up-heading}) moves backward to another heading +that is less deeply nested. @node Outline Visibility @subsection Outline Visibility Commands @@ -2311,8 +2311,7 @@ hides text), and @code{intangible} (which disallows moving point within the text). The @samp{Remove Special} menu item removes all of these special properties from the text in the region. - The @code{invisible} and @code{intangible} properties are not saved -in the @samp{text/enriched} format. + The @code{invisible} and @code{intangible} properties are not saved. @node Text Based Tables @section Editing Text-based Tables diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 8f22c2cde7..a3f713912e 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@ -1,3 +1,9 @@ +2012-06-11 Chong Yidong <[email protected]> + + * elisp.texi, vol1.texi, vol2.texi: Remove urlcolor setting. + + * vol2.texi: Include package.texi. + 2012-06-01 Chong Yidong <[email protected]> * Version 24.1 released. diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi index be224987d2..0382e958c5 100644 --- a/doc/lispref/customize.texi +++ b/doc/lispref/customize.texi @@ -711,7 +711,8 @@ This is done by using a customization type specification instead of a symbol for the key. @example -:options '("foo" ((function-item some-function) integer) +:options '("foo" + ((function-item some-function) integer) "baz") @end example @@ -719,7 +720,8 @@ Many alists use lists with two elements, instead of cons cells. For example, @example -(defcustom list-alist '(("foo" 1) ("bar" 2) ("baz" 3)) +(defcustom list-alist + '(("foo" 1) ("bar" 2) ("baz" 3)) "Each element is a list of the form (KEY VALUE).") @end example @@ -727,7 +729,8 @@ example, instead of @example -(defcustom cons-alist '(("foo" . 1) ("bar" . 2) ("baz" . 3)) +(defcustom cons-alist + '(("foo" . 1) ("bar" . 2) ("baz" . 3)) "Each element is a cons-cell (KEY . VALUE).") @end example diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 9110d6962e..02285e86e0 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -791,8 +791,8 @@ Its default value is a list of two functions: @findex collapse-delayed-warnings @findex display-delayed-warnings @noindent -The function @code{collapse-delayed-warnings} iterates through -@code{delayed-warnings-list}, removing repeated entries. The function +The function @code{collapse-delayed-warnings} removes repeated entries +from @code{delayed-warnings-list}. The function @code{display-delayed-warnings} calls @code{display-warning} on each of the entries in @code{delayed-warnings-list}, in turn, and then sets @code{delayed-warnings-list} to @code{nil}. @@ -2079,11 +2079,10 @@ the @code{:family} attribute (a string). The wild-card characters Emacs Manual}. @item :width -Relative proportionate character width, also known as the character -set width. This should be one of the symbols @code{ultra-condensed}, -@code{extra-condensed}, @code{condensed}, @code{semi-condensed}, -@code{normal}, @code{semi-expanded}, @code{expanded}, -@code{extra-expanded}, or @code{ultra-expanded}. +Relative character width. This should be one of the symbols +@code{ultra-condensed}, @code{extra-condensed}, @code{condensed}, +@code{semi-condensed}, @code{normal}, @code{semi-expanded}, +@code{expanded}, @code{extra-expanded}, or @code{ultra-expanded}. @item :height The height of the font. In the simplest case, this is an integer in diff --git a/doc/lispref/edebug.texi b/doc/lispref/edebug.texi index e97e90f947..94c4b8a219 100644 --- a/doc/lispref/edebug.texi +++ b/doc/lispref/edebug.texi @@ -1035,10 +1035,10 @@ The current match data. @xref{Match Data}. @item The variables @code{last-command}, @code{this-command}, -@code{last-input-event}, @code{last-command-event}, +@code{last-command-event}, @code{last-input-event}, @code{last-event-frame}, @code{last-nonmenu-event}, and -@code{track-mouse}. Commands used within Edebug do not affect these -variables outside of Edebug. +@code{track-mouse}. Commands in Edebug do not affect these variables +outside of Edebug. Executing commands within Edebug can change the key sequence that would be returned by @code{this-command-keys}, and there is no way to diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 5e0356ff1f..f826548ac7 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -14,7 +14,7 @@ @c in general, keep the following line commented out, unless doing a @c copy of this manual that will be published. The manual should go @c onto the distribution in the full, 8.5 x 11" size. -@c @smallbook +@c @set smallbook @ifset smallbook @smallbook @@ -26,8 +26,6 @@ @tex @ifset smallbook @fonttextsize 10 -\global\let\urlcolor=\Black % don't print links in grayscale -\global\let\linkcolor=\Black @end ifset \global\hbadness=6666 % don't worry about not-too-underfull boxes @end tex @@ -1522,12 +1520,8 @@ Object Internals @include package.texi -@c MOVE to Emacs Manual: include misc-modes.texi - @c appendices -@c REMOVE this: include non-hacker.texi - @include anti.texi @include doclicense.texi @include gpl.texi diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index f558089a20..dd355061c1 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -2954,7 +2954,8 @@ between consecutive checks. For example: (let ((remote-file-name-inhibit-cache (- display-time-interval 5))) (and (file-exists-p file) - (< 0 (nth 7 (file-attributes (file-chase-links file))))))) + (< 0 (nth 7 (file-attributes + (file-chase-links file))))))) @end example @end defopt diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi index 1d37b1b220..5958d56686 100644 --- a/doc/lispref/functions.texi +++ b/doc/lispref/functions.texi @@ -1264,8 +1264,8 @@ example, byte-compiling @file{fortran.el} used to warn: @example In end of data: -fortran.el:2152:1:Warning: the function `gud-find-c-expr' is not known - to be defined. +fortran.el:2152:1:Warning: the function `gud-find-c-expr' is not + known to be defined. @end example In fact, @code{gud-find-c-expr} is only used in the function that diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi index 2cec68719b..7ee8cc5548 100644 --- a/doc/lispref/keymaps.texi +++ b/doc/lispref/keymaps.texi @@ -449,8 +449,8 @@ override any non-@code{nil} binding in any other of the @var{maps}. @example (defvar help-mode-map (let ((map (make-sparse-keymap))) - (set-keymap-parent map (make-composed-keymap button-buffer-map - special-mode-map)) + (set-keymap-parent map + (make-composed-keymap button-buffer-map special-mode-map)) ... map) ... ) @end example @@ -1601,10 +1601,11 @@ to @code{self-insert-command}. @end defvar @cindex key translation function -You can use @code{input-decode-map}, @code{local-function-key-map}, or -@code{key-translation-map} for more than simple aliases, by using a -function, instead of a key sequence, as the ``translation'' of a key. -Then this function is called to compute the translation of that key. +You can use @code{input-decode-map}, @code{local-function-key-map}, +and @code{key-translation-map} for more than simple aliases, by using +a function, instead of a key sequence, as the ``translation'' of a +key. Then this function is called to compute the translation of that +key. The key translation function receives one argument, which is the prompt that was specified in @code{read-key-sequence}---or @code{nil} if the diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index 93cc7a4598..c7d9ff4ae6 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -515,9 +515,10 @@ the following: @item Definitions for major or minor modes: @code{define-minor-mode}, @code{define-globalized-minor-mode}, -@code{define-generic-mode}, @code{easy-mmode-define-minor-mode}, +@code{define-generic-mode}, @code{define-derived-mode}, +@code{easy-mmode-define-minor-mode}, @code{easy-mmode-define-global-mode}, @code{define-compilation-mode}, -@code{define-derived-mode}, and @code{define-global-minor-mode}. +and @code{define-global-minor-mode}. @item Other definition types: @code{defcustom}, @code{defgroup}, @code{defclass} diff --git a/doc/lispref/macros.texi b/doc/lispref/macros.texi index 5cdcfae1e5..196ed89d72 100644 --- a/doc/lispref/macros.texi +++ b/doc/lispref/macros.texi @@ -339,8 +339,9 @@ problem. This macro allows us to write a ``for'' loop construct. "Execute a simple \"for\" loop. For example, (for i from 1 to 10 do (print i))." (list 'let (list (list var init)) - (cons 'while (cons (list '<= var final) - (append body (list (list 'inc var))))))) + (cons 'while + (cons (list '<= var final) + (append body (list (list 'inc var))))))) @end group @result{} for diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 83a38b60bc..e96f30c9a7 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi @@ -1235,8 +1235,8 @@ each calls the following function to set various variables: @smallexample @group -(defun lisp-mode-variables (&optional lisp-syntax keywords-case-insensitive) - (when lisp-syntax +(defun lisp-mode-variables (&optional syntax keywords-case-insensitive) + (when syntax (set-syntax-table lisp-mode-syntax-table)) (setq local-abbrev-table lisp-mode-abbrev-table) @dots{} @@ -1309,9 +1309,9 @@ or to switch back to an existing one. Entry to this mode calls the value of `lisp-mode-hook' if that value is non-nil." (lisp-mode-variables nil t) - (set (make-local-variable 'find-tag-default-function) 'lisp-find-tag-default) - (make-local-variable 'comment-start-skip) - (setq comment-start-skip + (set (make-local-variable 'find-tag-default-function) + 'lisp-find-tag-default) + (set (make-local-variable 'comment-start-skip) "\\(\\(^\\|[^\\\\\n]\\)\\(\\\\\\\\\\)*\\)\\(;+\\|#|\\) *") (setq imenu-case-fold-search t)) @end group diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index c97cd09932..9237484f78 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi @@ -409,16 +409,15 @@ codepoint belongs: most unassigned codepoints get the value of or @code{R} (strong R). @item decomposition -Corresponds to the Unicode @code{Decomposition_Type} and -@code{Decomposition_Value} properties. The value is a list, whose -first element may be a symbol representing a compatibility formatting -tag, such as @code{small}@footnote{The Unicode specification writes -these tag names inside @samp{<..>} brackets, but the tag names in -Emacs do not include the brackets; e.g.@: Unicode specifies -@samp{<small>} where Emacs uses @samp{small}. }; the other elements -are characters that give the compatibility decomposition sequence of -this character. For unassigned codepoints, the value is the character -itself. +Corresponds to the Unicode properties @code{Decomposition_Type} and +@code{Decomposition_Value}. The value is a list, whose first element +may be a symbol representing a compatibility formatting tag, such as +@code{small}@footnote{The Unicode specification writes these tag names +inside @samp{<..>} brackets, but the tag names in Emacs do not include +the brackets; e.g.@: Unicode specifies @samp{<small>} where Emacs uses +@samp{small}. }; the other elements are characters that give the +compatibility decomposition sequence of this character. For +unassigned codepoints, the value is the character itself. @item decimal-digit-value Corresponds to the Unicode @code{Numeric_Value} property for diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 384531c8e3..bc5cde1bc3 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -2317,7 +2317,7 @@ channels and image data, respectively. @item :image-path @var{path} This is represented either as a URI (@samp{file://} is the only URI schema supported right now) or a name in a freedesktop.org-compliant -icon theme from @samp{$XDG_DATA_DIRS/icons}, like @samp{"mail-message-new"}. +icon theme from @samp{$XDG_DATA_DIRS/icons}. @item :sound-file @var{filename} The path to a sound file to play when the notification pops up. @@ -2414,26 +2414,27 @@ a symbol representing a supported external library, and the rest are strings giving alternate filenames for that library. Emacs tries to load the library from the files in the order they -appear in the list; if none is found, the running session of Emacs -won't have access to that library, and the features that depend on the -library will be unavailable. +appear in the list; if none is found, the Emacs session won't have +access to that library, and the features it provides will be +unavailable. Image support on some platforms uses this facility. Here's an example of setting this variable for supporting images on MS-Windows: -@lisp +@example (setq dynamic-library-alist '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll") (png "libpng12d.dll" "libpng12.dll" "libpng.dll" - "libpng13d.dll" "libpng13.dll") - (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll") + "libpng13d.dll" "libpng13.dll") + (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" + "jpeg.dll") (tiff "libtiff3.dll" "libtiff.dll") (gif "giflib4.dll" "libungif4.dll" "libungif.dll") (svg "librsvg-2-2.dll") (gdk-pixbuf "libgdk_pixbuf-2.0-0.dll") (glib "libglib-2.0-0.dll") (gobject "libgobject-2.0-0.dll"))) -@end lisp +@end example Note that image types @code{pbm} and @code{xbm} do not need entries in this variable because they do not depend on external libraries and are diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi index 99722c9390..9d7cffd51e 100644 --- a/doc/lispref/positions.texi +++ b/doc/lispref/positions.texi @@ -831,7 +831,8 @@ consequences, so the byte compiler warns if you call @code{set-buffer} during an excursion: @example -Warning: Use `with-current-buffer' rather than save-excursion+set-buffer +Warning: Use `with-current-buffer' rather than + save-excursion+set-buffer @end example @noindent diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 7426437e6f..a059272e43 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi @@ -1800,7 +1800,7 @@ The number of threads in the process. @item start The time when the process was started, in the same @w{@code{(@var{high} @var{low} @var{microsec})}} format used by -@code{current-time} and @code{file-attributes}. +@code{current-time} and by @code{file-attributes}. @item etime The time elapsed since the process started, in the @w{@code{(@var{high} diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 1963d2519a..51f425b121 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -216,8 +216,7 @@ properties, just the characters themselves. @xref{Text Properties}. @defun buffer-string This function returns the contents of the entire accessible portion of -the current buffer as a string. It is equivalent to -@w{@code{(buffer-substring (point-min) (point-max))}}. +the current buffer, as a string. @end defun @defun filter-buffer-substring start end &optional delete diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi index 2687cd57d5..b34659b48b 100644 --- a/doc/lispref/vol1.texi +++ b/doc/lispref/vol1.texi @@ -48,8 +48,6 @@ @tex @ifset smallbook @fonttextsize 10 -\global\let\urlcolor=\Black % don't print links in grayscale -\global\let\linkcolor=\Black @end ifset \global\hbadness=6666 % don't worry about not-too-underfull boxes @end tex @@ -1538,12 +1536,8 @@ Object Internals @c include display.texi @c include os.texi -@c MOVE to Emacs Manual: include misc-modes.texi - @c appendices -@c REMOVE this: include non-hacker.texi - @c include anti.texi @c include doclicense.texi @c include gpl.texi diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index c74e7c438b..e6fbf1264c 100644 --- a/doc/lispref/vol2.texi +++ b/doc/lispref/vol2.texi @@ -48,8 +48,6 @@ @tex @ifset smallbook @fonttextsize 10 -\global\let\urlcolor=\Black % don't print links in grayscale -\global\let\linkcolor=\Black @end ifset \global\hbadness=6666 % don't worry about not-too-underfull boxes @end tex @@ -1536,13 +1534,10 @@ Object Internals @include display.texi @include os.texi - -@c MOVE to Emacs Manual: include misc-modes.texi +@include package.texi @c appendices -@c REMOVE this: include non-hacker.texi - @include anti.texi @include doclicense.texi @include gpl.texi diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 75d4a9beb8..1fdc987ea3 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi @@ -1400,7 +1400,7 @@ When writing an application, you should normally use the higher-level functions described in @ref{Switching Buffers}, instead of calling @code{set-window-buffer} directly. -This function runs @code{window-scroll-functions}, followed by +This runs @code{window-scroll-functions}, followed by @code{window-configuration-change-hook}. @xref{Window Hooks}. @end defun |