commit ac9da241986b747c1122ad5d097db42795eb9737 (HEAD, refs/remotes/origin/master) Author: Robert Pluim Date: Sat Sep 5 11:37:29 2015 +0300 Avoid read error messages from 'inotify' * src/process.c (wait_reading_process_output): Add a 'tls_available' set and manipulate it instead of 'Available' when checking TLS inputs. Assign the value to 'Available' only if we find any TLS data waiting to be read. This avoids error messages from 'inotify' that tries to read data it shouldn't. (Bug#21337) diff --git a/src/process.c b/src/process.c index 1ab8378..f4613be 100644 --- a/src/process.c +++ b/src/process.c @@ -4859,6 +4859,10 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, data is available in the buffers manually. */ if (nfds == 0) { + fd_set tls_available; + int set = 0; + + FD_ZERO (&tls_available); if (! wait_proc) { /* We're not waiting on a specific process, so loop @@ -4879,7 +4883,8 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, { nfds++; eassert (p->infd == channel); - FD_SET (p->infd, &Available); + FD_SET (p->infd, &tls_available); + set++; } } } @@ -4896,9 +4901,12 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd, nfds = 1; eassert (0 <= wait_proc->infd); /* Set to Available. */ - FD_SET (wait_proc->infd, &Available); + FD_SET (wait_proc->infd, &tls_available); + set++; } } + if (set) + Available = tls_available; } #endif } commit ec14f087535282c188861815ac806024274185d5 Author: Eli Zaretskii Date: Sat Sep 5 11:22:11 2015 +0300 Avoid errors in thing-at-point with 2nd argument non-nil * lisp/thingatpt.el (thing-at-point): Only call 'length' on sequences. (Bug#21391) diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el index 6e90b26..a9c539b 100644 --- a/lisp/thingatpt.el +++ b/lisp/thingatpt.el @@ -145,7 +145,7 @@ a symbol as a valid THING." (let ((bounds (bounds-of-thing-at-point thing))) (when bounds (buffer-substring (car bounds) (cdr bounds))))))) - (when (and text no-properties) + (when (and text no-properties (sequencep text)) (set-text-properties 0 (length text) nil text)) text)) commit 90937cbfe48229028d839a5e8c5815020e84b235 Author: Philip Date: Sat Sep 5 11:08:57 2015 +0300 Fix segfaults due to using a stale face ID * src/xdisp.c (forget_escape_and_glyphless_faces): New function. (display_echo_area_1, redisplay_internal): Call it to avoid reusing stale face IDs for 'escape-glyph' and 'glyphless-char' faces, which could case a segfault if the frame's face cache was freed since the last redisplay. (Bug#21394) * src/xfaces.c (free_realized_faces): Call forget_escape_and_glyphless_faces. * src/dispextern.h (forget_escape_and_glyphless_faces): Add prototype. Copyright-paperwork-exempt: yes diff --git a/src/dispextern.h b/src/dispextern.h index 37ebab0..e5adeab 100644 --- a/src/dispextern.h +++ b/src/dispextern.h @@ -3245,6 +3245,7 @@ extern ptrdiff_t compute_display_string_end (ptrdiff_t, struct bidi_string_data *); extern void produce_stretch_glyph (struct it *); extern int merge_glyphless_glyph_face (struct it *); +extern void forget_escape_and_glyphless_faces (void); extern void get_font_ascent_descent (struct font *, int *, int *); diff --git a/src/xdisp.c b/src/xdisp.c index 9ff9f6c..82931b8 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -6787,6 +6787,18 @@ merge_glyphless_glyph_face (struct it *it) return face_id; } +/* Forget the `escape-glyph' and `glyphless-char' faces. This should + be called before redisplaying windows, and when the frame's face + cache is freed. */ +void +forget_escape_and_glyphless_faces (void) +{ + last_escape_glyph_frame = NULL; + last_escape_glyph_face_id = (1 << FACE_ID_BITS); + last_glyphless_glyph_frame = NULL; + last_glyphless_glyph_face_id = (1 << FACE_ID_BITS); +} + /* Load IT's display element fields with information about the next display element from the current position of IT. Value is false if end of buffer (or C string) is reached. */ @@ -10673,6 +10685,11 @@ display_echo_area_1 (ptrdiff_t a1, Lisp_Object a2) Lisp_Object window; struct text_pos start; + /* We are about to enter redisplay without going through + redisplay_internal, so we need to forget these faces by hand + here. */ + forget_escape_and_glyphless_faces (); + /* Do this before displaying, so that we have a large enough glyph matrix for the display. If we can't get enough space for the whole text, display the last N lines. That works by setting w->start. */ @@ -13326,10 +13343,7 @@ redisplay_internal (void) sw = w; pending = false; - last_escape_glyph_frame = NULL; - last_escape_glyph_face_id = (1 << FACE_ID_BITS); - last_glyphless_glyph_frame = NULL; - last_glyphless_glyph_face_id = (1 << FACE_ID_BITS); + forget_escape_and_glyphless_faces (); /* If face_change, init_iterator will free all realized faces, which includes the faces referenced from current matrices. So, we diff --git a/src/xfaces.c b/src/xfaces.c index d89adca..0303249 100644 --- a/src/xfaces.c +++ b/src/xfaces.c @@ -4173,6 +4173,8 @@ free_realized_faces (struct face_cache *c) c->faces_by_id[i] = NULL; } + /* Forget the escape-glyph and glyphless-char faces. */ + forget_escape_and_glyphless_faces (); c->used = 0; size = FACE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; memset (c->buckets, 0, size); commit 8a6260e1e14ab1523c195001454c98aaa044ea64 Author: Paul Eggert Date: Fri Sep 4 13:31:41 2015 -0700 Fix minor problems with " in manual diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index a2bea24..43c61d7 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi @@ -28,7 +28,7 @@ Reference Manual}. to decide what to do; by setting variables, you can control their functioning. * Key Bindings:: The keymaps say what command each key runs. - By changing them, you can "redefine keys". + By changing them, you can ``redefine keys''. * Init File:: How to write common customizations in the initialization file. @end menu diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index 5f53f9b..ec82a07 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi @@ -160,7 +160,7 @@ Fundamental Editing Commands * Help:: Commands for asking Emacs about its commands. Important Text-Changing Commands -* Mark:: The mark: how to delimit a "region" of text. +* Mark:: The mark: how to delimit a ``region'' of text. * Killing:: Killing (cutting) and yanking (copying) text. * Registers:: Saving a text string or a location in the buffer. * Display:: Controlling what text is displayed. @@ -172,7 +172,7 @@ Major Structures of Emacs * Files:: All about handling files. * Buffers:: Multiple buffers; editing several files at once. * Windows:: Viewing multiple pieces of text in one frame. -* Frames:: Using multiple "windows" on your display. +* Frames:: Using multiple ``windows'' on your display. * International:: Using non-@acronym{ASCII} character sets. Advanced Features @@ -200,7 +200,7 @@ Advanced Features @end ifnottex * Editing Binary Files:: Editing binary files with Hexl mode. * Saving Emacs Sessions:: Saving Emacs state from one session to the next. -* Recursive Edit:: Performing edits while "within another command". +* Recursive Edit:: Performing edits while ``within another command''. * Hyperlinking:: Following links in buffers. * Amusements:: Various games and hacks. * Packages:: Installing additional features. @@ -301,7 +301,7 @@ Help * Language Help:: Help relating to international language support. * Misc Help:: Other help commands. * Help Files:: Commands to display auxiliary help files. -* Help Echo:: Help on active text and tooltips ("balloon help"). +* Help Echo:: Help on active text and tooltips (``balloon help''). The Mark and the Region @@ -337,7 +337,7 @@ Yanking * Earlier Kills:: Yanking something killed some time ago. * Appending Kills:: Several kills in a row all yank together. -"Cut and Paste" Operations on Graphical Displays +``Cut and Paste'' Operations on Graphical Displays * Clipboard:: How Emacs uses the system clipboard. * Primary Selection:: The temporarily selected text selection. @@ -464,7 +464,7 @@ Saving Files * Customize Save:: Customizing the saving of files. * Interlocking:: How Emacs protects against simultaneous editing of one file by two users. -* File Shadowing:: Copying files to "shadows" automatically. +* File Shadowing:: Copying files to ``shadows'' automatically. * Time Stamps:: Emacs can update time stamps on saved files. Backup Files @@ -597,7 +597,7 @@ Commands for Human Languages * TeX Mode:: Editing TeX and LaTeX files. * HTML Mode:: Editing HTML and SGML files. * Nroff Mode:: Editing input to the nroff formatter. -* Enriched Text:: Editing text "enriched" with fonts, colors, etc. +* Enriched Text:: Editing text ``enriched'' with fonts, colors, etc. * Text Based Tables:: Commands for editing text-based tables. * Two-Column:: Splitting text columns into separate windows. @@ -638,7 +638,7 @@ Enriched Text * Enriched Indentation:: Changing the left and right margins. * Enriched Justification:: Centering, setting text flush with the left or right margin, etc. -* Enriched Properties:: The "special" text properties submenu. +* Enriched Properties:: The ``special'' text properties submenu. @c The automatic texinfo menu update inserts some duplicate items here @c (faces, colors, indentation, justification, properties), because @@ -895,7 +895,7 @@ Editing Pictures * Basic Picture:: Basic concepts and simple commands of Picture Mode. * Insert in Picture:: Controlling direction of cursor motion - after "self-inserting" characters. + after ``self-inserting'' characters. * Tabs in Picture:: Various features for tab stops and indentation. * Rectangles in Picture:: Clearing and superimposing rectangles. @end ifnottex @@ -1092,7 +1092,7 @@ Customization to decide what to do; by setting variables, you can control their functioning. * Key Bindings:: The keymaps say what command each key runs. - By changing them, you can "redefine" keys. + By changing them, you can ``redefine'' keys. * Init File:: How to write common customizations in the initialization file. diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 6ff59b4..5985d8b 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi @@ -340,7 +340,7 @@ that was visited in the buffer. * Customize Save:: Customizing the saving of files. * Interlocking:: How Emacs protects against simultaneous editing of one file by two users. -* Shadowing: File Shadowing. Copying files to "shadows" automatically. +* Shadowing: File Shadowing. Copying files to ``shadows'' automatically. * Time Stamps:: Emacs can update time stamps on saved files. @end menu diff --git a/doc/emacs/help.texi b/doc/emacs/help.texi index 5129c1c..6984250 100644 --- a/doc/emacs/help.texi +++ b/doc/emacs/help.texi @@ -72,7 +72,7 @@ inputs, but they all support @key{F1}.) * Language Help:: Help relating to international language support. * Misc Help:: Other help commands. * Help Files:: Commands to display auxiliary help files. -* Help Echo:: Help on active text and tooltips ("balloon help"). +* Help Echo:: Help on active text and tooltips (``balloon help''). @end menu @iftex diff --git a/doc/emacs/picture-xtra.texi b/doc/emacs/picture-xtra.texi index 6be84bd..a9ad2d5 100644 --- a/doc/emacs/picture-xtra.texi +++ b/doc/emacs/picture-xtra.texi @@ -53,7 +53,7 @@ Additional extensions to Picture mode can be found in @menu * Basic Picture:: Basic concepts and simple commands of Picture Mode. * Insert in Picture:: Controlling direction of cursor motion - after "self-inserting" characters. + after ``self-inserting'' characters. * Tabs in Picture:: Various features for tab stops and indentation. * Rectangles in Picture:: Clearing and superimposing rectangles. @end menu diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi index 34d4e8f..a0dfe22 100644 --- a/doc/emacs/search.texi +++ b/doc/emacs/search.texi @@ -1342,13 +1342,13 @@ to replace all remaining occurrences without asking again. to replace all remaining occurrences in all remaining buffers in multi-buffer replacements (like the Dired @key{Q} command that performs query replace on selected files). It answers this question and all -subsequent questions in the series with "yes", without further +subsequent questions in the series with ``yes'', without further user interaction. @item N @r{(Upper-case)} to skip to the next buffer in multi-buffer replacements without replacing remaining occurrences in the current buffer. It answers -this question "no", gives up on the questions for the current buffer, +this question ``no'', gives up on the questions for the current buffer, and continues to the next buffer in the sequence. @item ^ diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi index 31760b7..389ef5e 100644 --- a/doc/emacs/text.texi +++ b/doc/emacs/text.texi @@ -78,7 +78,7 @@ for editing such pictures. * TeX Mode:: Editing TeX and LaTeX files. * HTML Mode:: Editing HTML and SGML files. * Nroff Mode:: Editing input to the nroff formatter. -* Enriched Text:: Editing text "enriched" with fonts, colors, etc. +* Enriched Text:: Editing text ``enriched'' with fonts, colors, etc. * Text Based Tables:: Commands for editing text-based tables. * Two-Column:: Splitting text columns into separate windows. @end menu @@ -2072,7 +2072,7 @@ serves as an example of the features of Enriched mode. * Enriched Indentation:: Changing the left and right margins. * Enriched Justification:: Centering, setting text flush with the left or right margin, etc. -* Enriched Properties:: The "special" text properties submenu. +* Enriched Properties:: The ``special'' text properties submenu. @end menu @node Enriched Mode diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi index fc01a97..2233376 100644 --- a/doc/emacs/trouble.texi +++ b/doc/emacs/trouble.texi @@ -1345,16 +1345,16 @@ Emacs has additional style and coding conventions: @item @ifset WWW_GNU_ORG @ifhtml -the "Tips" Appendix in the Emacs Lisp Reference +the ``Tips'' Appendix in the Emacs Lisp Reference @url{http://www.gnu.org/software/emacs/manual/html_node/elisp/Tips.html}. @end ifhtml @ifnothtml -@xref{Tips, "Tips" Appendix in the Emacs Lisp Reference, Tips +@xref{Tips, ``Tips'' Appendix in the Emacs Lisp Reference, Tips Appendix, elisp, Emacs Lisp Reference}. @end ifnothtml @end ifset @ifclear WWW_GNU_ORG -@xref{Tips, "Tips" Appendix in the Emacs Lisp Reference, Tips +@xref{Tips, ``Tips'' Appendix in the Emacs Lisp Reference, Tips Appendix, elisp, Emacs Lisp Reference}. @end ifclear @@ -1398,7 +1398,7 @@ See gnu-misc-discuss instead.) A copyright disclaimer is also a possibility, but we prefer an assignment. Note that the disclaimer, like an assignment, involves you sending -signed paperwork to the FSF (simply saying "this is in the public domain" +signed paperwork to the FSF (simply saying ``this is in the public domain'' is not enough). Also, a disclaimer cannot be applied to future work, it has to be repeated each time you want to send something new. diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index 3ac2418..5ad5f26 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi @@ -13947,7 +13947,7 @@ What happens is this: the search is limited to the region, and fails as you expect because there are no word-constituent characters in the region. Since it fails, we receive an error message. But we do not want to receive an error message in this case; we want to receive the -message that "The region does NOT have any words." +message ``The region does NOT have any words.'' The solution to this problem is to provide @code{re-search-forward} with a third argument of @code{t}, which causes the function to return diff --git a/doc/lispref/anti.texi b/doc/lispref/anti.texi index c1773aa..2784fd9 100644 --- a/doc/lispref/anti.texi +++ b/doc/lispref/anti.texi @@ -56,8 +56,8 @@ there is no need to worry about the insertion of right-to-left text messing up how lines and paragraphs are displayed, the function @code{bidi-string-mark-left-to-right} has been removed; so have many other functions and variables related to bidirectional display. -Unicode directionality characters like @code{U+200E} ("left-to-right -mark") have no special effect on display. +Unicode directionality characters like @code{U+200E} LEFT-TO-RIGHT +MARK have no special effect on display. @item Emacs windows now have most of their internal state hidden from Lisp. diff --git a/doc/lispref/buffers.texi b/doc/lispref/buffers.texi index 49bfe82..71261e0 100644 --- a/doc/lispref/buffers.texi +++ b/doc/lispref/buffers.texi @@ -23,7 +23,7 @@ not be displayed in any windows. * Buffer File Name:: The buffer file name indicates which file is visited. * Buffer Modification:: A buffer is @dfn{modified} if it needs to be saved. * Modification Time:: Determining whether the visited file was changed - "behind Emacs's back". + ``behind Emacs's back''. * Read Only Buffers:: Modifying text is not allowed in a read-only buffer. * Buffer List:: How to look at all the existing buffers. * Creating Buffers:: Functions that create buffers. diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 9044fba..7b2b68a 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi @@ -453,7 +453,7 @@ Kinds of Forms we find the real function via the symbol. * Function Forms:: Forms that call functions. * Macro Forms:: Forms that call macros. -* Special Forms:: "Special forms" are idiosyncratic primitives, +* Special Forms:: ``Special forms'' are idiosyncratic primitives, most of them extremely important. * Autoloading:: Functions set up to load files containing their real definitions. @@ -485,7 +485,7 @@ Errors Variables * Global Variables:: Variable values that exist permanently, everywhere. -* Constant Variables:: Certain "variables" have values that never change. +* Constant Variables:: Certain ``variables'' have values that never change. * Local Variables:: Variable values that exist only temporarily. * Void Variables:: Symbols that lack values. * Defining Variables:: A definition says a symbol is used as a variable. @@ -599,7 +599,7 @@ Loading * Repeated Loading:: Precautions about loading a file twice. * Named Features:: Loading a library if it isn't already loaded. * Where Defined:: Finding which file defined a certain symbol. -* Unloading:: How to "unload" a library that was loaded. +* Unloading:: How to ``unload'' a library that was loaded. * Hooks for Loading:: Providing code to be run when particular libraries are loaded. @@ -990,7 +990,7 @@ Buffers is visited. * Buffer Modification:: A buffer is @dfn{modified} if it needs to be saved. * Modification Time:: Determining whether the visited file was changed - "behind Emacs's back". + ``behind Emacs's back''. * Read Only Buffers:: Modifying text is not allowed in a read-only buffer. * Buffer List:: How to look at all the existing buffers. @@ -1117,8 +1117,8 @@ Markers * Marker Insertion Types:: Two ways a marker can relocate when you insert where it points. * Moving Markers:: Moving the marker to a new buffer or position. -* The Mark:: How "the mark" is implemented with a marker. -* The Region:: How to access "the region". +* The Mark:: How ``the mark'' is implemented with a marker. +* The Region:: How to access ``the region''. Text @@ -1152,7 +1152,7 @@ Text * Base 64:: Conversion to or from base 64 encoding. * Checksum/Hash:: Computing cryptographic hashes. * Parsing HTML/XML:: Parsing HTML and XML. -* Atomic Changes:: Installing several buffer changes "atomically". +* Atomic Changes:: Installing several buffer changes ``atomically''. * Change Hooks:: Supplying functions to be run when text is changed. The Kill Ring diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi index a185da7..f253e70 100644 --- a/doc/lispref/eval.texi +++ b/doc/lispref/eval.texi @@ -116,7 +116,7 @@ with the ``all other types'' which are self-evaluating forms. we find the real function via the symbol. * Function Forms:: Forms that call functions. * Macro Forms:: Forms that call macros. -* Special Forms:: "Special forms" are idiosyncratic primitives, +* Special Forms:: ``Special forms'' are idiosyncratic primitives, most of them extremely important. * Autoloading:: Functions set up to load files containing their real definitions. diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi index f4c9abd..91b0c96 100644 --- a/doc/lispref/files.texi +++ b/doc/lispref/files.texi @@ -1291,10 +1291,10 @@ has only one name (the name @file{files.texi} in the current default directory). @item "lh" -is owned by the user with name "lh". +is owned by the user with name @samp{lh}. @item "users" -is in the group with name "users". +is in the group with name @samp{users}. @item (20614 64019 50040 152000) was last accessed on October 23, 2012, at 20:12:03.050040152 UTC. diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi index fc1def6..91dc9a9 100644 --- a/doc/lispref/loading.texi +++ b/doc/lispref/loading.texi @@ -40,7 +40,7 @@ For on-demand loading of external libraries, @pxref{Dynamic Libraries}. * Repeated Loading:: Precautions about loading a file twice. * Named Features:: Loading a library if it isn't already loaded. * Where Defined:: Finding which file defined a certain symbol. -* Unloading:: How to "unload" a library that was loaded. +* Unloading:: How to ``unload'' a library that was loaded. * Hooks for Loading:: Providing code to be run when particular libraries are loaded. @end menu diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi index 109e935..4f25b91 100644 --- a/doc/lispref/markers.texi +++ b/doc/lispref/markers.texi @@ -20,8 +20,8 @@ deleted, so that it stays with the two characters on either side of it. * Marker Insertion Types:: Two ways a marker can relocate when you insert where it points. * Moving Markers:: Moving the marker to a new buffer or position. -* The Mark:: How "the mark" is implemented with a marker. -* The Region:: How to access "the region". +* The Mark:: How ``the mark'' is implemented with a marker. +* The Region:: How to access ``the region''. @end menu @node Overview of Markers diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index bbe87ca..8d7177d 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi @@ -2480,7 +2480,7 @@ argument of another @code{notifications-notify} call. For example: @end group @group -A message window opens on the desktop. Press "I agree" +A message window opens on the desktop. Press ``I agree''. @result{} Message 22, key "Confirm" pressed Message 22, closed due to "dismissed" @end group diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi index d882be4..4a33893 100644 --- a/doc/lispref/strings.texi +++ b/doc/lispref/strings.texi @@ -486,8 +486,8 @@ accent Unicode characters: The optional argument @var{locale}, a string, overrides the setting of your current locale identifier for collation. The value is system -dependent; a @var{locale} "en_US.UTF-8" is applicable on POSIX -systems, while it would be, e.g., "enu_USA.1252" on MS-Windows +dependent; a @var{locale} @code{"en_US.UTF-8"} is applicable on POSIX +systems, while it would be, e.g., @code{"enu_USA.1252"} on MS-Windows systems. If @var{ignore-case} is non-@code{nil}, characters are converted to lower-case @@ -495,7 +495,7 @@ before comparing them. To emulate Unicode-compliant collation on MS-Windows systems, bind @code{w32-collate-ignore-punctuation} to a non-@code{nil} value, since -the codeset part of the locale cannot be "UTF-8" on MS-Windows. +the codeset part of the locale cannot be @code{"UTF-8"} on MS-Windows. If your system does not support a locale environment, this function behaves like @code{string-equal}. @@ -596,9 +596,9 @@ less significant for @ref{Sorting,,sorting}. The optional argument @var{locale}, a string, overrides the setting of your current locale identifier for collation. The value is system -dependent; a @var{locale} "en_US.UTF-8" is applicable on POSIX -systems, while it would be, e.g., "enu_USA.1252" on MS-Windows -systems. The @var{locale} "POSIX" lets @code{string-collate-lessp} +dependent; a @var{locale} @code{"en_US.UTF-8"} is applicable on POSIX +systems, while it would be, e.g., @code{"enu_USA.1252"} on MS-Windows +systems. The @var{locale} @code{"POSIX"} lets @code{string-collate-lessp} behave like @code{string-lessp}: @example @@ -614,7 +614,7 @@ before comparing them. To emulate Unicode-compliant collation on MS-Windows systems, bind @code{w32-collate-ignore-punctuation} to a non-@code{nil} value, since -the codeset part of the locale cannot be "UTF-8" on MS-Windows. +the codeset part of the locale cannot be @code{"UTF-8"} on MS-Windows. If your system does not support a locale environment, this function behaves like @code{string-lessp}. diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 245825a..3304428 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi @@ -58,7 +58,7 @@ the character after point. * Base 64:: Conversion to or from base 64 encoding. * Checksum/Hash:: Computing cryptographic hashes. * Parsing HTML/XML:: Parsing HTML and XML. -* Atomic Changes:: Installing several buffer changes "atomically". +* Atomic Changes:: Installing several buffer changes ``atomically''. * Change Hooks:: Supplying functions to be run when text is changed. @end menu diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 15491e5..369e8dd 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi @@ -25,7 +25,7 @@ representing the variable. @menu * Global Variables:: Variable values that exist permanently, everywhere. -* Constant Variables:: Certain "variables" have values that never change. +* Constant Variables:: Certain ``variables'' have values that never change. * Local Variables:: Variable values that exist only temporarily. * Void Variables:: Symbols that lack values. * Defining Variables:: A definition says a symbol is used as a variable. diff --git a/doc/misc/ert.texi b/doc/misc/ert.texi index 3192e4b..35d315c 100644 --- a/doc/misc/ert.texi +++ b/doc/misc/ert.texi @@ -861,7 +861,7 @@ The most common use of this is to run just the tests for one particular module. Since symbol prefixes are the usual way of separating module namespaces in Emacs Lisp, test selectors already solve this by allowing regexp matching on test names; e.g., the -selector "^ert-" selects ERT's self-tests. +selector @code{"^ert-"} selects ERT's self-tests. Other uses include grouping tests by their expected execution time, e.g., to run quick tests during interactive development and slow tests less diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index 0b856c7..5ab34a0 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi @@ -892,11 +892,11 @@ more readable? @subsubheading Answer -Gnus offers you several functions to "wash" incoming mail, you can +Gnus offers you several functions to ``wash'' incoming mail, you can find them if you browse through the menu, item -Article->Washing. The most interesting ones are probably "Wrap -long lines" (@samp{W w}), "Decode ROT13" -(@samp{W r}) and "Outlook Deuglify" which repairs +Article->Washing. The most interesting ones are probably ``Wrap +long lines'' (@samp{W w}), ``Decode ROT13'' +(@samp{W r}) and ``Outlook Deuglify'' which repairs the dumb quoting used by many users of Microsoft products (@samp{W Y f} gives you full deuglify. See @samp{W Y C-h} or have a look at the menus for @@ -1016,8 +1016,8 @@ mail groups. Is this a bug? No, that's a matter of design of Gnus, fixing this would mean reimplementation of major parts of Gnus' -back ends. Gnus thinks "highest-article-number @minus{} -lowest-article-number = total-number-of-articles". This +back ends. Gnus thinks ``highest-article-number @minus{} +lowest-article-number = total-number-of-articles''. This works OK for Usenet groups, but if you delete and move many messages in mail groups, this fails. To cure the symptom, enter the group via @samp{C-u RET} @@ -1085,8 +1085,8 @@ You've got to play around with the variable gnus-summary-line-format. Its value is a string of symbols which stand for things like author, date, subject etc. A list of the available specifiers can be found in the -manual node "Summary Buffer Lines" and the often forgotten -node "Formatting Variables" and its sub-nodes. There +manual node ``Summary Buffer Lines'' and the often forgotten +node ``Formatting Variables'' and its sub-nodes. There you'll find useful things like positioning the cursor and tabulators which allow you a summary in table form, but sadly hard tabulators are broken in 5.8.8. diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index 23a43f4..dbce16c 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi @@ -12565,7 +12565,7 @@ Gnus provides a few different methods for storing the mail and news you send. The default method is to use the @dfn{archive virtual server} to store the messages. If you want to disable this completely, the @code{gnus-message-archive-group} variable should be @code{nil}. The -default is "sent.%Y-%m", which gives you one archive group per month. +default is @code{"sent.%Y-%m"}, which gives you one archive group per month. For archiving interesting messages in a group you read, see the @kbd{B c} (@code{gnus-summary-copy-article}) command (@pxref{Mail diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index f449e3b..8f57e8c 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi @@ -1961,7 +1961,7 @@ can include a line like this in your Viper customization file: Viper lets you define hot keys, i.e., you can associate keyboard keys such as F1, Help, PgDn, etc., with Emacs Lisp functions (that may already -exist or that you will write). Each key has a "preferred form" in +exist or that you will write). Each key has a ``preferred form'' in Emacs. For instance, the Up key's preferred form is [up], the Help key's preferred form is [help], and the Undo key has the preferred form [f14]. You can find out the preferred form of a key by typing @kbd{M-x commit 262a23dac0ad6c06197a9e2994dca4b896ac0a58 Author: Michael Albinus Date: Fri Sep 4 20:56:32 2015 +0200 * doc/misc/tramp.texi (Frequently Asked Questions): New item for ad-hoc multi-hop files. diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi index 012c586..87c7c80 100644 --- a/doc/misc/tramp.texi +++ b/doc/misc/tramp.texi @@ -3691,6 +3691,24 @@ I would like to thank all @value{tramp} users who have contributed to the different recipes! +@item I have saved @value{tramp} file names as indicated. But it +doesn't work in a new @value{emacsname} session! + +If you have saved an ad-hoc multi-hop @value{tramp} file name +(@pxref{Ad-hoc multi-hops}) via bookmarks, recent files, +@ifset emacs +filecache, bbdb, +@end ifset +or another package, you must use the full ad-hoc file name including +all hops, like @file{@trampfn{ssh, bird, +bastion|ssh@value{postfixhop}news.my.domain, /opt/news/etc}}. + +Alternatively, if you save only the abbreviated multi-hop file name +@file{@trampfn{ssh, news, news.my.domain, /opt/news/etc}}, the +customer option @code{tramp-save-ad-hoc-proxies} must be set to a to a +non-@code{nil} value. + + @ifset emacs @item How can I use @value{tramp} to connect to a remote @value{emacsname} commit 09c15856a926eb80106a5c42571660601c2167d6 Author: Glenn Morris Date: Fri Sep 4 06:19:49 2015 -0400 ; Auto-commit of loaddefs files. diff --git a/lisp/dired.el b/lisp/dired.el index eee703b..37d69e9 100644 --- a/lisp/dired.el +++ b/lisp/dired.el @@ -4399,7 +4399,7 @@ instead. ;;;*** -;;;### (autoloads nil "dired-x" "dired-x.el" "c1a6289ba8504b605595321436a9c04d") +;;;### (autoloads nil "dired-x" "dired-x.el" "06a24044ec0f92e6f187101321d1e926") ;;; Generated autoloads from dired-x.el (autoload 'dired-jump "dired-x" "\