aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRüdiger Sonderfeld2013-05-23 11:27:48 -0400
committerStefan Monnier2013-05-23 11:27:48 -0400
commitfe1eb856c5457a220c7c9cc96030247aaad2a0a3 (patch)
tree1d1268e5a2e3d31a6e86fcce0c26b7a17613a781
parent961721282ba26fd393f62603ee088df5d933b51c (diff)
downloademacs-fe1eb856c5457a220c7c9cc96030247aaad2a0a3.tar.gz
emacs-fe1eb856c5457a220c7c9cc96030247aaad2a0a3.zip
* lisp/ielm.el (ielm-menu): New menu.
(inferior-emacs-lisp-mode): Set comment-start.
-rw-r--r--lisp/ChangeLog17
-rw-r--r--lisp/ielm.el10
2 files changed, 21 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e067b0242ec..e9484600cde 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,10 +1,15 @@
12013-05-23 Rüdiger Sonderfeld <ruediger@c-plusplus.de> 12013-05-23 Rüdiger Sonderfeld <ruediger@c-plusplus.de>
2 2
3 * lisp/textmodes/reftex.el (reftex-ref-style-toggle): Fix 3 * ielm.el (ielm-menu): New menu.
4 deactivate action. 4 (inferior-emacs-lisp-mode): Set comment-start.
5 5
6 * lisp/textmodes/reftex-vars.el (reftex-ref-style-alist): Add 62013-05-23 Rüdiger Sonderfeld <ruediger@c-plusplus.de>
7 cleveref macros. 7
8 * lisp/textmodes/reftex.el (reftex-ref-style-toggle):
9 Fix deactivate action.
10
11 * lisp/textmodes/reftex-vars.el (reftex-ref-style-alist):
12 Add cleveref macros.
8 13
9 * lisp/textmodes/reftex-parse.el 14 * lisp/textmodes/reftex-parse.el
10 (reftex-locate-bibliography-files): Accept options for 15 (reftex-locate-bibliography-files): Accept options for
@@ -309,8 +314,8 @@
309 314
3102013-05-17 Leo Liu <sdl.web@gmail.com> 3152013-05-17 Leo Liu <sdl.web@gmail.com>
311 316
312 * emacs-lisp/smie.el (smie-highlight-matching-block-mode): Clean 317 * emacs-lisp/smie.el (smie-highlight-matching-block-mode):
313 up when turned off. (Bug#14395) 318 Clean up when turned off. (Bug#14395)
314 (smie--highlight-matching-block-overlay): No longer buffer-local. 319 (smie--highlight-matching-block-overlay): No longer buffer-local.
315 (smie-highlight-matching-block): Adjust. 320 (smie-highlight-matching-block): Adjust.
316 321
diff --git a/lisp/ielm.el b/lisp/ielm.el
index d90800873a2..610cc3ea364 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -184,6 +184,13 @@ This variable is buffer-local.")
184 "Keymap for IELM mode.") 184 "Keymap for IELM mode.")
185(defvaralias 'inferior-emacs-lisp-mode-map 'ielm-map) 185(defvaralias 'inferior-emacs-lisp-mode-map 'ielm-map)
186 186
187(easy-menu-define ielm-menu ielm-map
188 "IELM mode menu."
189 '("IELM"
190 ["Change Working Buffer" ielm-change-working-buffer t]
191 ["Display Working Buffer" ielm-display-working-buffer t]
192 ["Print Working Buffer" ielm-print-working-buffer t]))
193
187(defvar ielm-font-lock-keywords 194(defvar ielm-font-lock-keywords
188 '(("\\(^\\*\\*\\*[^*]+\\*\\*\\*\\)\\(.*$\\)" 195 '(("\\(^\\*\\*\\*[^*]+\\*\\*\\*\\)\\(.*$\\)"
189 (1 font-lock-comment-face) 196 (1 font-lock-comment-face)
@@ -499,6 +506,9 @@ Customized bindings may be defined in `ielm-map', which currently contains:
499 (setq comint-get-old-input 'ielm-get-old-input) 506 (setq comint-get-old-input 'ielm-get-old-input)
500 (set (make-local-variable 'comint-completion-addsuffix) '("/" . "")) 507 (set (make-local-variable 'comint-completion-addsuffix) '("/" . ""))
501 (setq mode-line-process '(":%s on " (:eval (buffer-name ielm-working-buffer)))) 508 (setq mode-line-process '(":%s on " (:eval (buffer-name ielm-working-buffer))))
509 ;; Useful for `hs-minor-mode'.
510 (setq-local comment-start ";")
511 (setq-local comment-use-global-state t)
502 512
503 (set (make-local-variable 'indent-line-function) 'ielm-indent-line) 513 (set (make-local-variable 'indent-line-function) 'ielm-indent-line)
504 (set (make-local-variable 'ielm-working-buffer) (current-buffer)) 514 (set (make-local-variable 'ielm-working-buffer) (current-buffer))