aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorPaul Eggert2015-09-03 15:31:12 -0700
committerPaul Eggert2015-09-03 15:32:54 -0700
commit26bd978d87dfbf9baa115cd961a67d42b416c4bf (patch)
tree20f3d063895796f54b9f521c0b35f65bbcd418c4 /lisp/progmodes
parent944d77f070da388b0c6e6578a9f868e88c088940 (diff)
downloademacs-26bd978d87dfbf9baa115cd961a67d42b416c4bf.tar.gz
emacs-26bd978d87dfbf9baa115cd961a67d42b416c4bf.zip
Fix some more docstring etc. quoting problems
Mostly these fixes prevent the transliteration of apostrophes that should stay apostrophes. Also, prefer curved quotes in Bahá’í proper names, as that’s the preferred Bahá’í style and these names are chock-full of non-ASCII characters anyway. * lisp/emacs-lisp/eieio-core.el (eieio-defclass-autoload) (eieio-defclass-internal): * lisp/emacs-lisp/eieio.el (defclass): * lisp/hi-lock.el (hi-lock-mode): Don’t transliterate Lisp apostrophes when generating a doc string or diagnostic. * lisp/international/mule-diag.el (list-coding-systems-1): * lisp/international/ogonek.el (ogonek-jak, ogonek-how): * lisp/mail/sendmail.el (sendmail-query-user-about-smtp): * lisp/vc/ediff-mult.el (ediff-redraw-registry-buffer): * lisp/vc/ediff-ptch.el (ediff-fixup-patch-map): Substitute quotes before putting them in the help buffer.
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/cc-engine.el18
-rw-r--r--lisp/progmodes/cc-langs.el12
-rw-r--r--lisp/progmodes/cc-vars.el2
-rw-r--r--lisp/progmodes/cperl-mode.el2
-rw-r--r--lisp/progmodes/elisp-mode.el2
-rw-r--r--lisp/progmodes/f90.el2
-rw-r--r--lisp/progmodes/fortran.el8
-rw-r--r--lisp/progmodes/gdb-mi.el18
-rw-r--r--lisp/progmodes/idlw-shell.el20
-rw-r--r--lisp/progmodes/idlwave.el20
-rw-r--r--lisp/progmodes/prolog.el12
-rw-r--r--lisp/progmodes/python.el2
-rw-r--r--lisp/progmodes/vhdl-mode.el4
-rw-r--r--lisp/progmodes/xref.el4
14 files changed, 62 insertions, 64 deletions
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index f26b8ec6dd1..82f0d722d03 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -634,7 +634,7 @@ move into or out of sexps (not even normal expression parentheses).
634 634
635If point is already at the earliest statement within braces or parens, 635If point is already at the earliest statement within braces or parens,
636this function doesn't move back into any whitespace preceding it; it 636this function doesn't move back into any whitespace preceding it; it
637returns 'same in this case. 637returns `same' in this case.
638 638
639Stop at statement continuation tokens like \"else\", \"catch\", 639Stop at statement continuation tokens like \"else\", \"catch\",
640\"finally\" and the \"while\" in \"do ... while\" if the start point 640\"finally\" and the \"while\" in \"do ... while\" if the start point
@@ -656,19 +656,19 @@ start of the definition in a \"#define\". Also stop at start of
656macros before leaving them. 656macros before leaving them.
657 657
658Return: 658Return:
659'label if stopped at a label or \"case...:\" or \"default:\"; 659`label' if stopped at a label or \"case...:\" or \"default:\";
660'same if stopped at the beginning of the current statement; 660`same' if stopped at the beginning of the current statement;
661'up if stepped to a containing statement; 661`up' if stepped to a containing statement;
662'previous if stepped to a preceding statement; 662`previous' if stepped to a preceding statement;
663'beginning if stepped from a statement continuation clause to 663`beginning' if stepped from a statement continuation clause to
664 its start clause; or 664 its start clause; or
665'macro if stepped to a macro start. 665`macro' if stepped to a macro start.
666Note that 'same and not 'label is returned if stopped at the same 666Note that `same' and not `label' is returned if stopped at the same
667label without crossing the colon character. 667label without crossing the colon character.
668 668
669LIM may be given to limit the search. If the search hits the limit, 669LIM may be given to limit the search. If the search hits the limit,
670point will be left at the closest following token, or at the start 670point will be left at the closest following token, or at the start
671position if that is less ('same is returned in this case). 671position if that is less (`same' is returned in this case).
672 672
673NOERROR turns off error logging to `c-parsing-error'. 673NOERROR turns off error logging to `c-parsing-error'.
674 674
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 0e904d23c5b..a1e26b9fcc4 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -926,14 +926,14 @@ following elements. The car of each element describes the type of the
926operator group, and the cdr is a list of the operator tokens in it. 926operator group, and the cdr is a list of the operator tokens in it.
927The operator group types are: 927The operator group types are:
928 928
929'prefix Unary prefix operators. 929`prefix' Unary prefix operators.
930'postfix Unary postfix operators. 930`postfix' Unary postfix operators.
931'postfix-if-paren 931`postfix-if-paren'
932 Unary postfix operators if and only if the chars have 932 Unary postfix operators if and only if the chars have
933 parenthesis syntax. 933 parenthesis syntax.
934'left-assoc Binary left associative operators (i.e. a+b+c means (a+b)+c). 934`left-assoc' Binary left associative operators (i.e. a+b+c means (a+b)+c).
935'right-assoc Binary right associative operators (i.e. a=b=c means a=(b=c)). 935`right-assoc' Binary right associative operators (i.e. a=b=c means a=(b=c)).
936'right-assoc-sequence 936`right-assoc-sequence'
937 Right associative operator that constitutes of a 937 Right associative operator that constitutes of a
938 sequence of tokens that separate expressions. All the 938 sequence of tokens that separate expressions. All the
939 tokens in the group are in this case taken as 939 tokens in the group are in this case taken as
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index df6e987721b..da36647f2cd 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -833,7 +833,7 @@ string in the mode line), and a semicolon or comma is typed (see
833no arguments, and should return one of the following values: 833no arguments, and should return one of the following values:
834 834
835 nil -- no determination made, continue checking 835 nil -- no determination made, continue checking
836 'stop -- do not insert a newline, and stop checking 836 `stop' -- do not insert a newline, and stop checking
837 (anything else) -- insert a newline, and stop checking 837 (anything else) -- insert a newline, and stop checking
838 838
839If every function in the list is called with no determination made, 839If every function in the list is called with no determination made,
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 322024ea448..b8ba170a246 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -724,7 +724,7 @@ mode-compile.el.
724If your Emacs does not default to `cperl-mode' on Perl files, and you 724If your Emacs does not default to `cperl-mode' on Perl files, and you
725want it to: put the following into your .emacs file: 725want it to: put the following into your .emacs file:
726 726
727 (defalias 'perl-mode 'cperl-mode) 727 (defalias \\='perl-mode \\='cperl-mode)
728 728
729Get perl5-info from 729Get perl5-info from
730 $CPAN/doc/manual/info/perl5-old/perl5-info.tar.gz 730 $CPAN/doc/manual/info/perl5-old/perl5-info.tar.gz
diff --git a/lisp/progmodes/elisp-mode.el b/lisp/progmodes/elisp-mode.el
index bcabf3cdf59..1ea9f174775 100644
--- a/lisp/progmodes/elisp-mode.el
+++ b/lisp/progmodes/elisp-mode.el
@@ -1322,7 +1322,7 @@ which see."
1322 0 - contains the last symbol read from the buffer. 1322 0 - contains the last symbol read from the buffer.
1323 1 - contains the string last displayed in the echo area for variables, 1323 1 - contains the string last displayed in the echo area for variables,
1324 or argument string for functions. 1324 or argument string for functions.
1325 2 - 'function if function args, 'variable if variable documentation.") 1325 2 - `function' if function args, `variable' if variable documentation.")
1326 1326
1327(defun elisp-eldoc-documentation-function () 1327(defun elisp-eldoc-documentation-function ()
1328 "`eldoc-documentation-function' (which see) for Emacs Lisp." 1328 "`eldoc-documentation-function' (which see) for Emacs Lisp."
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index 43b057ba882..e8a1ae455ee 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1425,7 +1425,7 @@ single - statement is not continued.
1425begin - current line is the first in a continued statement. 1425begin - current line is the first in a continued statement.
1426end - current line is the last in a continued statement 1426end - current line is the last in a continued statement
1427middle - current line is neither first nor last in a continued statement. 1427middle - current line is neither first nor last in a continued statement.
1428Comment lines embedded amongst continued lines return 'middle." 1428Comment lines embedded amongst continued lines return `middle'."
1429 (let (pcont cont) 1429 (let (pcont cont)
1430 (save-excursion 1430 (save-excursion
1431 (setq pcont (if (f90-previous-statement) (f90-line-continued)))) 1431 (setq pcont (if (f90-previous-statement) (f90-line-continued))))
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 83e427da790..ee4733f6e4e 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -817,15 +817,15 @@ Variables controlling indentation style and extra features:
817 Amount of extra indentation for text in full-line comments (default 0). 817 Amount of extra indentation for text in full-line comments (default 0).
818`fortran-comment-indent-style' 818`fortran-comment-indent-style'
819 How to indent the text in full-line comments. Allowed values are: 819 How to indent the text in full-line comments. Allowed values are:
820 nil don't change the indentation 820 nil don't change the indentation
821 fixed indent to `fortran-comment-line-extra-indent' beyond the 821 `fixed' indent to `fortran-comment-line-extra-indent' beyond the
822 value of either 822 value of either
823 `fortran-minimum-statement-indent-fixed' (fixed format) or 823 `fortran-minimum-statement-indent-fixed' (fixed format) or
824 `fortran-minimum-statement-indent-tab' (TAB format), 824 `fortran-minimum-statement-indent-tab' (TAB format),
825 depending on the continuation format in use. 825 depending on the continuation format in use.
826 relative indent to `fortran-comment-line-extra-indent' beyond the 826 `relative' indent to `fortran-comment-line-extra-indent' beyond the
827 indentation for a line of code. 827 indentation for a line of code.
828 (default 'fixed) 828 (default `fixed')
829`fortran-comment-indent-char' 829`fortran-comment-indent-char'
830 Single-character string to be inserted instead of space for 830 Single-character string to be inserted instead of space for
831 full-line comment indentation (default \" \"). 831 full-line comment indentation (default \" \").
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 9942e17397a..1eff62c5acf 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -2065,7 +2065,7 @@ a GDB/MI reply message."
2065(defun gdbmi-bnf-gdb-prompt () 2065(defun gdbmi-bnf-gdb-prompt ()
2066 "Implementation of the following GDB/MI output grammar rule: 2066 "Implementation of the following GDB/MI output grammar rule:
2067 gdb-prompt ==> 2067 gdb-prompt ==>
2068 '(gdb)' nl 2068 `(gdb)' nl
2069 2069
2070 nl ==> 2070 nl ==>
2071 CR | CR-LF" 2071 CR | CR-LF"
@@ -2085,7 +2085,7 @@ a GDB/MI reply message."
2085 "Implementation of the following GDB/MI output grammar rule: 2085 "Implementation of the following GDB/MI output grammar rule:
2086 2086
2087 result-record ==> 2087 result-record ==>
2088 [ token ] '^' result-class ( ',' result )* nl 2088 [ token ] `^' result-class ( `,' result )* nl
2089 2089
2090 token ==> 2090 token ==>
2091 any sequence of digits." 2091 any sequence of digits."
@@ -2110,16 +2110,16 @@ a GDB/MI reply message."
2110 exec-async-output | status-async-output | notify-async-output 2110 exec-async-output | status-async-output | notify-async-output
2111 2111
2112 exec-async-output ==> 2112 exec-async-output ==>
2113 [ token ] '*' async-output 2113 [ token ] `*' async-output
2114 2114
2115 status-async-output ==> 2115 status-async-output ==>
2116 [ token ] '+' async-output 2116 [ token ] `+' async-output
2117 2117
2118 notify-async-output ==> 2118 notify-async-output ==>
2119 [ token ] '=' async-output 2119 [ token ] `=' async-output
2120 2120
2121 async-output ==> 2121 async-output ==>
2122 async-class ( ',' result )* nl" 2122 async-class ( `,' result )* nl"
2123 2123
2124 (gdbmi-bnf-result-and-async-record-impl)) 2124 (gdbmi-bnf-result-and-async-record-impl))
2125 2125
@@ -2130,13 +2130,13 @@ a GDB/MI reply message."
2130 console-stream-output | target-stream-output | log-stream-output 2130 console-stream-output | target-stream-output | log-stream-output
2131 2131
2132 console-stream-output ==> 2132 console-stream-output ==>
2133 '~' c-string 2133 `~' c-string
2134 2134
2135 target-stream-output ==> 2135 target-stream-output ==>
2136 '@' c-string 2136 `@' c-string
2137 2137
2138 log-stream-output ==> 2138 log-stream-output ==>
2139 '&' c-string" 2139 `&' c-string"
2140 (when (< gdbmi-bnf-offset (length gud-marker-acc)) 2140 (when (< gdbmi-bnf-offset (length gud-marker-acc))
2141 (if (and (member (aref gud-marker-acc gdbmi-bnf-offset) '(?~ ?@ ?&)) 2141 (if (and (member (aref gud-marker-acc gdbmi-bnf-offset) '(?~ ?@ ?&))
2142 (string-match (concat "\\([~@&]\\)\\(" gdb--string-regexp "\\)\n") 2142 (string-match (concat "\\([~@&]\\)\\(" gdb--string-regexp "\\)\n")
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index b5e799848de..ce2f830ec42 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -152,7 +152,7 @@ This variable can have 3 values:
152nil Arrows just move the cursor 152nil Arrows just move the cursor
153t Arrows force the cursor back to the current command line and 153t Arrows force the cursor back to the current command line and
154 walk the history 154 walk the history
155'cmdline When the cursor is in the current command line, arrows walk the 155`cmdline' When the cursor is in the current command line, arrows walk the
156 history. Everywhere else in the buffer, arrows move the cursor." 156 history. Everywhere else in the buffer, arrows move the cursor."
157 :group 'idlwave-shell-general-setup 157 :group 'idlwave-shell-general-setup
158 :type '(choice 158 :type '(choice
@@ -439,15 +439,13 @@ Value decides about the method which is used to mark the line. Valid values
439are: 439are:
440 440
441nil Do not mark the line 441nil Do not mark the line
442'arrow Use the overlay arrow 442`arrow' Use the overlay arrow
443'face Use `idlwave-shell-stop-line-face' to highlight the line. 443`face' Use `idlwave-shell-stop-line-face' to highlight the line.
444t Use what IDLWAVE thinks is best. Will be a face where possible, 444t Use what IDLWAVE thinks is best. Will be a face where possible,
445 otherwise the overlay arrow. 445 otherwise the overlay arrow.
446The overlay-arrow has the disadvantage to hide the first chars of a line. 446The overlay-arrow has the disadvantage to hide the first chars of a line.
447Since many people do not have the main block of IDL programs indented, 447Since many people do not have the main block of IDL programs indented,
448a face highlighting may be better. 448a face highlighting may be better."
449In Emacs 21, the overlay arrow is displayed in a special area and never
450hides any code, so setting this to 'arrow on Emacs 21 sounds like a good idea."
451 :group 'idlwave-shell-highlighting-and-faces 449 :group 'idlwave-shell-highlighting-and-faces
452 :type '(choice 450 :type '(choice
453 (const :tag "No marking" nil) 451 (const :tag "No marking" nil)
@@ -494,10 +492,10 @@ where IDL is stopped, when in Electric Debug Mode."
494 "Non-nil means, mark breakpoints in the source files. 492 "Non-nil means, mark breakpoints in the source files.
495Valid values are: 493Valid values are:
496nil Do not mark breakpoints. 494nil Do not mark breakpoints.
497'face Highlight line with `idlwave-shell-breakpoint-face'. 495`face' Highlight line with `idlwave-shell-breakpoint-face'.
498'glyph Red dot at the beginning of line. If the display does not 496`glyph' Red dot at the beginning of line. If the display does not
499 support glyphs, will use 'face instead. 497 support glyphs, will use `face' instead.
500t Glyph when possible, otherwise face (same effect as 'glyph)." 498t Glyph when possible, otherwise face (same effect as `glyph')."
501 :group 'idlwave-shell-highlighting-and-faces 499 :group 'idlwave-shell-highlighting-and-faces
502 :type '(choice 500 :type '(choice
503 (const :tag "No marking" nil) 501 (const :tag "No marking" nil)
@@ -3911,7 +3909,7 @@ Elements of the alist have the form:
3911 3909
3912(defun idlwave-shell-module-source-query (module &optional type) 3910(defun idlwave-shell-module-source-query (module &optional type)
3913 "Determine the source file for a given module. 3911 "Determine the source file for a given module.
3914Query as a function if TYPE set to something beside 'pro." 3912Query as a function if TYPE set to something beside `pro'."
3915 (if module 3913 (if module
3916 (idlwave-shell-send-command 3914 (idlwave-shell-send-command
3917 (format "print,(routine_info('%s',/SOURCE%s)).PATH" module 3915 (format "print,(routine_info('%s',/SOURCE%s)).PATH" module
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index daf919adb2f..9930d501d4d 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -376,7 +376,7 @@ The following values are allowed:
376 376
377nil Don't scan any buffers. 377nil Don't scan any buffers.
378t Scan all `idlwave-mode' buffers in the current editing session. 378t Scan all `idlwave-mode' buffers in the current editing session.
379current Scan only the current buffer, but no other buffers." 379`current' Scan only the current buffer, but no other buffers."
380 :group 'idlwave-routine-info 380 :group 'idlwave-routine-info
381 :type '(choice 381 :type '(choice
382 (const :tag "No buffer" nil) 382 (const :tag "No buffer" nil)
@@ -5833,15 +5833,15 @@ to override IDLWAVE's idea of what should be completed at point.
5833Possible values are: 5833Possible values are:
5834 5834
58350 <=> query for the completion type 58350 <=> query for the completion type
58361 <=> 'procedure 58361 <=> `procedure'
58372 <=> 'procedure-keyword 58372 <=> `procedure-keyword'
58383 <=> 'function 58383 <=> `function'
58394 <=> 'function-keyword 58394 <=> `function-keyword'
58405 <=> 'procedure-method 58405 <=> `procedure-method'
58416 <=> 'procedure-method-keyword 58416 <=> `procedure-method-keyword'
58427 <=> 'function-method 58427 <=> `function-method'
58438 <=> 'function-method-keyword 58438 <=> `function-method-keyword'
58449 <=> 'class 58449 <=> `class'
5845 5845
5846As a special case, the universal argument C-u forces completion of 5846As a special case, the universal argument C-u forces completion of
5847function names in places where the default would be a keyword. 5847function names in places where the default would be a keyword.
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index b95c3f97117..5a4ed84c346 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -402,11 +402,11 @@ Only used in ( If -> Then ; Else) and ( Disj1 ; Disj2 ) style expressions."
402(defcustom prolog-parse-mode 'beg-of-clause 402(defcustom prolog-parse-mode 'beg-of-clause
403 "The parse mode used (decides from which point parsing is done). 403 "The parse mode used (decides from which point parsing is done).
404Legal values: 404Legal values:
405'beg-of-line - starts parsing at the beginning of a line, unless the 405`beg-of-line' - starts parsing at the beginning of a line, unless the
406 previous line ends with a backslash. Fast, but has 406 previous line ends with a backslash. Fast, but has
407 problems detecting multiline /* */ comments. 407 problems detecting multiline /* */ comments.
408'beg-of-clause - starts parsing at the beginning of the current clause. 408`beg-of-clause' - starts parsing at the beginning of the current clause.
409 Slow, but copes better with /* */ comments." 409 Slow, but copes better with /* */ comments."
410 :version "24.1" 410 :version "24.1"
411 :group 'prolog-indentation 411 :group 'prolog-indentation
412 :type '(choice (const :value beg-of-line) 412 :type '(choice (const :value beg-of-line)
@@ -1209,7 +1209,7 @@ using the commands `send-region', `send-string' and \\[prolog-consult-region].
1209Commands: 1209Commands:
1210Tab indents for Prolog; with argument, shifts rest 1210Tab indents for Prolog; with argument, shifts rest
1211 of expression rigidly with the current line. 1211 of expression rigidly with the current line.
1212Paragraphs are separated only by blank lines and '%%'. '%'s start comments. 1212Paragraphs are separated only by blank lines and `%%'. `%'s start comments.
1213 1213
1214Return at end of buffer sends line as input. 1214Return at end of buffer sends line as input.
1215Return not at end copies rest of line to end and sends it. 1215Return not at end copies rest of line to end and sends it.
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 63a43c1b31a..a95206463b6 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2979,7 +2979,7 @@ This is a wrapper over `buffer-substring' that takes care of
2979different transformations for the code sent to be evaluated in 2979different transformations for the code sent to be evaluated in
2980the python shell: 2980the python shell:
2981 1. When optional argument NOMAIN is non-nil everything under an 2981 1. When optional argument NOMAIN is non-nil everything under an
2982 \"if __name__ == '__main__'\" block will be removed. 2982 \"if __name__ == \\='__main__\\='\" block will be removed.
2983 2. When a subregion of the buffer is sent, it takes care of 2983 2. When a subregion of the buffer is sent, it takes care of
2984 appending extra empty lines so tracebacks are correct. 2984 appending extra empty lines so tracebacks are correct.
2985 3. When the region sent is a substring of the current buffer, a 2985 3. When the region sent is a substring of the current buffer, a
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index 47b15d886bc..34ac5995568 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -4361,7 +4361,7 @@ Usage:
4361 ;;; --> \" := \" [[ --> [ --CR --> comment-out code 4361 ;;; --> \" := \" [[ --> [ --CR --> comment-out code
4362 .. --> \" => \" ] --> ) --- --> horizontal line 4362 .. --> \" => \" ] --> ) --- --> horizontal line
4363 ,, --> \" <= \" ]] --> ] ---- --> display comment 4363 ,, --> \" <= \" ]] --> ] ---- --> display comment
4364 == --> \" == \" '' --> \\\" 4364 == --> \" == \" \\='\\=' --> \\\"
4365 4365
4366 4366
4367 WORD COMPLETION: 4367 WORD COMPLETION:
@@ -4808,7 +4808,7 @@ Usage:
4808 automatically recognized as VHDL source files. To add an extension 4808 automatically recognized as VHDL source files. To add an extension
4809 \".xxx\", add the following line to your Emacs start-up file (`.emacs'): 4809 \".xxx\", add the following line to your Emacs start-up file (`.emacs'):
4810 4810
4811 \(push '(\"\\\\.xxx\\\\'\" . vhdl-mode) auto-mode-alist) 4811 \(push \\='(\"\\\\.xxx\\\\\\='\" . vhdl-mode) auto-mode-alist)
4812 4812
4813 4813
4814 HINTS: 4814 HINTS:
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index b0a8eb7a316..7eff1f123b5 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -390,8 +390,8 @@ elements is negated."
390 "Go to the location of ITEM and display the buffer. 390 "Go to the location of ITEM and display the buffer.
391WINDOW controls how the buffer is displayed: 391WINDOW controls how the buffer is displayed:
392 nil -- switch-to-buffer 392 nil -- switch-to-buffer
393 'window -- pop-to-buffer (other window) 393 `window' -- pop-to-buffer (other window)
394 'frame -- pop-to-buffer (other frame)" 394 `frame' -- pop-to-buffer (other frame)"
395 (let* ((marker (save-excursion 395 (let* ((marker (save-excursion
396 (xref-location-marker (xref-item-location item)))) 396 (xref-location-marker (xref-item-location item))))
397 (buf (marker-buffer marker))) 397 (buf (marker-buffer marker)))