diff options
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 13 | ||||
| -rw-r--r-- | lisp/progmodes/prolog.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/scheme.el | 4 |
5 files changed, 12 insertions, 19 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 10512265e71..67de518e56d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,11 @@ | |||
| 1 | 2013-11-05 Bozhidar Batsov <bozhidar@batsov.com> | 1 | 2013-11-05 Bozhidar Batsov <bozhidar@batsov.com> |
| 2 | 2 | ||
| 3 | * progmodes/python.el (python-mode): Remove incorrect text from docstring. | ||
| 4 | * progmodes/scheme.el (scheme-mode): Remove incorrect text from docstring. | ||
| 5 | * progmodes/prolog.el (prolog-mode): Remove incorrect text from docstring. | ||
| 6 | * emacs-lisp/lisp-mode.el (lisp-mode, lisp-interaction-mode, emacs-lisp-mode): | ||
| 7 | Remove incorrect text from docstring. | ||
| 8 | |||
| 3 | * progmodes/ruby-mode.el (ruby-mode): Remove incorrect text from docstring. | 9 | * progmodes/ruby-mode.el (ruby-mode): Remove incorrect text from docstring. |
| 4 | 10 | ||
| 5 | 2013-11-04 Stefan Monnier <monnier@iro.umontreal.ca> | 11 | 2013-11-04 Stefan Monnier <monnier@iro.umontreal.ca> |
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index 8d4e6e3a20a..f4e9b311acc 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el | |||
| @@ -700,9 +700,7 @@ Commands: | |||
| 700 | Delete converts tabs to spaces as it moves back. | 700 | Delete converts tabs to spaces as it moves back. |
| 701 | Blank lines separate paragraphs. Semicolons start comments. | 701 | Blank lines separate paragraphs. Semicolons start comments. |
| 702 | 702 | ||
| 703 | \\{emacs-lisp-mode-map} | 703 | \\{emacs-lisp-mode-map}" |
| 704 | Entry to this mode calls the value of `emacs-lisp-mode-hook' | ||
| 705 | if that value is non-nil." | ||
| 706 | :group 'lisp | 704 | :group 'lisp |
| 707 | (lisp-mode-variables nil nil 'elisp) | 705 | (lisp-mode-variables nil nil 'elisp) |
| 708 | (setq imenu-case-fold-search nil) | 706 | (setq imenu-case-fold-search nil) |
| @@ -792,10 +790,7 @@ Blank lines separate paragraphs. Semicolons start comments. | |||
| 792 | 790 | ||
| 793 | \\{lisp-mode-map} | 791 | \\{lisp-mode-map} |
| 794 | Note that `run-lisp' may be used either to start an inferior Lisp job | 792 | Note that `run-lisp' may be used either to start an inferior Lisp job |
| 795 | or to switch back to an existing one. | 793 | or to switch back to an existing one." |
| 796 | |||
| 797 | Entry to this mode calls the value of `lisp-mode-hook' | ||
| 798 | if that value is non-nil." | ||
| 799 | (lisp-mode-variables nil t) | 794 | (lisp-mode-variables nil t) |
| 800 | (setq-local find-tag-default-function 'lisp-find-tag-default) | 795 | (setq-local find-tag-default-function 'lisp-find-tag-default) |
| 801 | (setq-local comment-start-skip | 796 | (setq-local comment-start-skip |
| @@ -860,9 +855,7 @@ Delete converts tabs to spaces as it moves back. | |||
| 860 | Paragraphs are separated only by blank lines. | 855 | Paragraphs are separated only by blank lines. |
| 861 | Semicolons start comments. | 856 | Semicolons start comments. |
| 862 | 857 | ||
| 863 | \\{lisp-interaction-mode-map} | 858 | \\{lisp-interaction-mode-map}" |
| 864 | Entry to this mode calls the value of `lisp-interaction-mode-hook' | ||
| 865 | if that value is non-nil." | ||
| 866 | :abbrev-table nil) | 859 | :abbrev-table nil) |
| 867 | 860 | ||
| 868 | (defun eval-print-last-sexp () | 861 | (defun eval-print-last-sexp () |
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el index 5a2d7c1cf0e..c766189c4d2 100644 --- a/lisp/progmodes/prolog.el +++ b/lisp/progmodes/prolog.el | |||
| @@ -1109,9 +1109,7 @@ To find out what version of Prolog mode you are running, enter | |||
| 1109 | `\\[prolog-mode-version]'. | 1109 | `\\[prolog-mode-version]'. |
| 1110 | 1110 | ||
| 1111 | Commands: | 1111 | Commands: |
| 1112 | \\{prolog-mode-map} | 1112 | \\{prolog-mode-map}" |
| 1113 | Entry to this mode calls the value of `prolog-mode-hook' | ||
| 1114 | if that value is non-nil." | ||
| 1115 | (setq mode-name (concat "Prolog" | 1113 | (setq mode-name (concat "Prolog" |
| 1116 | (cond | 1114 | (cond |
| 1117 | ((eq prolog-system 'eclipse) "[ECLiPSe]") | 1115 | ((eq prolog-system 'eclipse) "[ECLiPSe]") |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index ca9c3c6e6ef..7a90f0bb5ee 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -3591,9 +3591,7 @@ list is returned as is." | |||
| 3591 | (define-derived-mode python-mode prog-mode "Python" | 3591 | (define-derived-mode python-mode prog-mode "Python" |
| 3592 | "Major mode for editing Python files. | 3592 | "Major mode for editing Python files. |
| 3593 | 3593 | ||
| 3594 | \\{python-mode-map} | 3594 | \\{python-mode-map}" |
| 3595 | Entry to this mode calls the value of `python-mode-hook' | ||
| 3596 | if that value is non-nil." | ||
| 3597 | (set (make-local-variable 'tab-width) 8) | 3595 | (set (make-local-variable 'tab-width) 8) |
| 3598 | (set (make-local-variable 'indent-tabs-mode) nil) | 3596 | (set (make-local-variable 'indent-tabs-mode) nil) |
| 3599 | 3597 | ||
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el index fda7d6b6852..eabb222a84b 100644 --- a/lisp/progmodes/scheme.el +++ b/lisp/progmodes/scheme.el | |||
| @@ -210,9 +210,7 @@ start an inferior Scheme using the more general `cmuscheme' package. | |||
| 210 | Commands: | 210 | Commands: |
| 211 | Delete converts tabs to spaces as it moves back. | 211 | Delete converts tabs to spaces as it moves back. |
| 212 | Blank lines separate paragraphs. Semicolons start comments. | 212 | Blank lines separate paragraphs. Semicolons start comments. |
| 213 | \\{scheme-mode-map} | 213 | \\{scheme-mode-map}" |
| 214 | Entry to this mode calls the value of `scheme-mode-hook' | ||
| 215 | if that value is non-nil." | ||
| 216 | (scheme-mode-variables)) | 214 | (scheme-mode-variables)) |
| 217 | 215 | ||
| 218 | (defgroup scheme nil | 216 | (defgroup scheme nil |