aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/progmodes
diff options
context:
space:
mode:
authorPaul Eggert2016-01-30 11:43:26 -0800
committerPaul Eggert2016-01-30 11:43:26 -0800
commitcb4e054e41cdb7e398351a5ae8224759e721349e (patch)
treeae2bec4f10425bd61e2a90563edc178d382bb4b8 /lisp/progmodes
parente6d575316a42946aac6d83c9587f09afd1a59d98 (diff)
parent60902756b0d794b16b9c1c67c4c40a3ac04d1c1b (diff)
downloademacs-cb4e054e41cdb7e398351a5ae8224759e721349e.tar.gz
emacs-cb4e054e41cdb7e398351a5ae8224759e721349e.zip
-
Diffstat (limited to 'lisp/progmodes')
-rw-r--r--lisp/progmodes/antlr-mode.el4
-rw-r--r--lisp/progmodes/cc-engine.el6
-rw-r--r--lisp/progmodes/etags.el2
-rw-r--r--lisp/progmodes/python.el4
-rw-r--r--lisp/progmodes/vhdl-mode.el4
5 files changed, 10 insertions, 10 deletions
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index 20880a806fd..ee81add340c 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -537,8 +537,8 @@ corresponding kind, i.e., looks like \(OPTION-DEF...).
537Each OPTION-DEF looks like \(OPTION-NAME EXTRA-FN VALUE-SPEC...) which 537Each OPTION-DEF looks like \(OPTION-NAME EXTRA-FN VALUE-SPEC...) which
538defines a file/grammar/rule/subrule option with name OPTION-NAME. The 538defines a file/grammar/rule/subrule option with name OPTION-NAME. The
539OPTION-NAMEs are used for the creation of the \"Insert XXX Option\" 539OPTION-NAMEs are used for the creation of the \"Insert XXX Option\"
540submenus, see `antlr-options-use-submenus', and to allow to insert the 540submenus, see `antlr-options-use-submenus', and to allow the insertion
541option name with completion when using \\[antlr-insert-option]. 541of the option name with completion when using \\[antlr-insert-option].
542 542
543If EXTRA-FN is a function, it is called at different phases of the 543If EXTRA-FN is a function, it is called at different phases of the
544insertion with arguments \(PHASE OPTION-NAME). PHASE can have the 544insertion with arguments \(PHASE OPTION-NAME). PHASE can have the
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 018805d679f..dc2480961d1 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -8278,8 +8278,8 @@ comment at the start of cc-engine.el for more info."
8278 before-lparen after-rparen 8278 before-lparen after-rparen
8279 (here (point)) 8279 (here (point))
8280 (pp-count-out 20) ; Max number of paren/brace constructs before 8280 (pp-count-out 20) ; Max number of paren/brace constructs before
8281 ; we give up 8281 ; we give up.
8282 ids ; List of identifiers in the parenthesised list. 8282 ids ; List of identifiers in the parenthesized list.
8283 id-start after-prec-token decl-or-cast decl-res 8283 id-start after-prec-token decl-or-cast decl-res
8284 c-last-identifier-range identifier-ok) 8284 c-last-identifier-range identifier-ok)
8285 (narrow-to-region low-lim (or macro-end (point-max))) 8285 (narrow-to-region low-lim (or macro-end (point-max)))
@@ -8304,7 +8304,7 @@ comment at the start of cc-engine.el for more info."
8304 ;; { 8304 ;; {
8305 ;; 8305 ;;
8306 ;; Additionally, for a knr list to be recognized: 8306 ;; Additionally, for a knr list to be recognized:
8307 ;; o - The identifier of each deeclarator up to and including the 8307 ;; o - The identifier of each declarator up to and including the
8308 ;; one "near" point must be contained in the arg list. 8308 ;; one "near" point must be contained in the arg list.
8309 8309
8310 (catch 'knr 8310 (catch 'knr
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 271033b15f8..a2a0df2d6e1 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -2100,7 +2100,7 @@ for \\[find-tag] (which see)."
2100 (etags--xref-find-definitions symbol t)) 2100 (etags--xref-find-definitions symbol t))
2101 2101
2102(defun etags--xref-find-definitions (pattern &optional regexp?) 2102(defun etags--xref-find-definitions (pattern &optional regexp?)
2103 ;; This emulates the behaviour of `find-tag-in-order' but instead of 2103 ;; This emulates the behavior of `find-tag-in-order' but instead of
2104 ;; returning one match at a time all matches are returned as list. 2104 ;; returning one match at a time all matches are returned as list.
2105 ;; NOTE: find-tag-tag-order is typically a buffer-local variable. 2105 ;; NOTE: find-tag-tag-order is typically a buffer-local variable.
2106 (let* ((xrefs '()) 2106 (let* ((xrefs '())
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index a8c65fa23a9..01f7f251edd 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -2737,7 +2737,7 @@ killed."
2737 (process (get-buffer-process buffer)) 2737 (process (get-buffer-process buffer))
2738 ;; Users can override the interpreter and args 2738 ;; Users can override the interpreter and args
2739 ;; interactively when calling `run-python', let-binding 2739 ;; interactively when calling `run-python', let-binding
2740 ;; these allows to have the new right values in all 2740 ;; these allows having the new right values in all
2741 ;; setup code that is done in `inferior-python-mode', 2741 ;; setup code that is done in `inferior-python-mode',
2742 ;; which is important, especially for prompt detection. 2742 ;; which is important, especially for prompt detection.
2743 (python-shell--interpreter interpreter) 2743 (python-shell--interpreter interpreter)
@@ -3351,7 +3351,7 @@ def __PYTHON_EL_native_completion_setup():
3351 if not completion: 3351 if not completion:
3352 if self.last_completion != '1__dummy_completion__': 3352 if self.last_completion != '1__dummy_completion__':
3353 # When no more completions are available, returning a 3353 # When no more completions are available, returning a
3354 # dummy with non-sharing prefix allow to ensure output 3354 # dummy with non-sharing prefix allow ensuring output
3355 # while preventing changes to current input. 3355 # while preventing changes to current input.
3356 # Coincidentally it's also the end of output. 3356 # Coincidentally it's also the end of output.
3357 completion = '1__dummy_completion__' 3357 completion = '1__dummy_completion__'
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index d20a6b2f682..b176e64652e 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -4422,8 +4422,8 @@ Usage:
4422 according to option `vhdl-argument-list-indent'. 4422 according to option `vhdl-argument-list-indent'.
4423 4423
4424 If option `vhdl-indent-tabs-mode' is nil, spaces are used instead of 4424 If option `vhdl-indent-tabs-mode' is nil, spaces are used instead of
4425 tabs. `\\[tabify]' and `\\[untabify]' allow to convert spaces to tabs 4425 tabs. `\\[tabify]' and `\\[untabify]' allow the conversion of spaces to
4426 and vice versa. 4426 tabs and vice versa.
4427 4427
4428 Syntax-based indentation can be very slow in large files. Option 4428 Syntax-based indentation can be very slow in large files. Option
4429 `vhdl-indent-syntax-based' allows you to use faster but simpler indentation. 4429 `vhdl-indent-syntax-based' allows you to use faster but simpler indentation.