aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2013-06-20 12:28:23 +0200
committerJuanma Barranquero2013-06-20 12:28:23 +0200
commit01a439012b9393e1325ab983dfcebad0307f0a03 (patch)
tree294ddf9d9742defefcc974001db77807aee0565a
parent33cbd259d658c2efd5c82a9ffbd88a0f8a19bc9e (diff)
downloademacs-01a439012b9393e1325ab983dfcebad0307f0a03.tar.gz
emacs-01a439012b9393e1325ab983dfcebad0307f0a03.zip
Revert 2013-06-20T00:39:59Z!lekktu@gmail.com.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/progmodes/prog-mode.el3
2 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 748b8ca5939..773f8913533 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -6,9 +6,6 @@
6 (ansi-color-apply-sequence, ansi-color-map): Fix typos in docstrings. 6 (ansi-color-apply-sequence, ansi-color-map): Fix typos in docstrings.
7 (ansi-color-make-color-map): Rename local var ansi-color-map to map. 7 (ansi-color-make-color-map): Rename local var ansi-color-map to map.
8 8
9 * progmodes/prog-mode.el (prettify-symbols-mode)
10 (global-prettify-symbols-mode, prog-mode): Remove autoload cookies.
11
122013-06-19 Lars Magne Ingebrigtsen <larsi@gnus.org> 92013-06-19 Lars Magne Ingebrigtsen <larsi@gnus.org>
13 10
14 * net/eww.el (eww-process-text-input): Display passwords as asterisks. 11 * net/eww.el (eww-process-text-input): Display passwords as asterisks.
diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el
index a4b3c11d7d8..b3ed328bd72 100644
--- a/lisp/progmodes/prog-mode.el
+++ b/lisp/progmodes/prog-mode.el
@@ -89,6 +89,7 @@ Regexp match data 0 points to the chars."
89 89
90(defvar-local prettify-symbols--keywords nil) 90(defvar-local prettify-symbols--keywords nil)
91 91
92;;;###autoload
92(define-minor-mode prettify-symbols-mode 93(define-minor-mode prettify-symbols-mode
93 "Toggle Prettify Symbols mode. 94 "Toggle Prettify Symbols mode.
94With a prefix argument ARG, enable Prettify Symbols mode if ARG is 95With a prefix argument ARG, enable Prettify Symbols mode if ARG is
@@ -131,9 +132,11 @@ support it."
131 (local-variable-p 'prettify-symbols-alist)) 132 (local-variable-p 'prettify-symbols-alist))
132 (prettify-symbols-mode 1))) 133 (prettify-symbols-mode 1)))
133 134
135;;;###autoload
134(define-globalized-minor-mode global-prettify-symbols-mode 136(define-globalized-minor-mode global-prettify-symbols-mode
135 prettify-symbols-mode turn-on-prettify-symbols-mode) 137 prettify-symbols-mode turn-on-prettify-symbols-mode)
136 138
139;;;###autoload
137(define-derived-mode prog-mode fundamental-mode "Prog" 140(define-derived-mode prog-mode fundamental-mode "Prog"
138 "Major mode for editing programming language source code." 141 "Major mode for editing programming language source code."
139 (setq-local require-final-newline mode-require-final-newline) 142 (setq-local require-final-newline mode-require-final-newline)