diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/help.el | 8 | ||||
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 4 |
3 files changed, 20 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 26bcb7fd668..c6b0499a657 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,13 @@ +2014-04-09 Dmitry Gutov <dgutov@yandex.ru> + + * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight more + Module methods. (Bug#17216) + +2014-04-09 Stefan Monnier <monnier@iro.umontreal.ca> + + * help.el (describe-bindings): Fix buffer handling (bug#17210). + (describe-bindings-internal): Mark obsolete. + 2014-04-09 Stefan Monnier <monnier@iro.umontreal.ca> * subr.el (with-silent-modifications): Don't bind deactivate-mark, diff --git a/lisp/help.el b/lisp/help.el index 76c27de8da6..932270204c5 100644 --- a/lisp/help.el +++ b/lisp/help.el @@ -482,8 +482,11 @@ or a buffer name." (or buffer (setq buffer (current-buffer))) (help-setup-xref (list #'describe-bindings prefix buffer) (called-interactively-p 'interactive)) - (with-current-buffer buffer - (describe-bindings-internal nil prefix))) + (with-help-window (help-buffer) + ;; Be aware that `describe-buffer-bindings' puts its output into + ;; the current buffer. + (with-current-buffer (help-buffer) + (describe-buffer-bindings buffer prefix)))) ;; This function used to be in keymap.c. (defun describe-bindings-internal (&optional menus prefix) @@ -494,6 +497,7 @@ The optional argument MENUS, if non-nil, says to mention menu bindings. \(Ordinarily these are omitted from the output.) The optional argument PREFIX, if non-nil, should be a key sequence; then we display only bindings that start with that prefix." + (declare (obsolete describe-buffer-bindings "24.4")) (let ((buf (current-buffer))) (with-help-window (help-buffer) ;; Be aware that `describe-buffer-bindings' puts its output into diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el index 6c6cdd3427d..912736707ef 100644 --- a/lisp/progmodes/ruby-mode.el +++ b/lisp/progmodes/ruby-mode.el @@ -2065,6 +2065,10 @@ See `font-lock-syntax-table'.") "include" "module_function" "prepend" + "private_class_method" + "private_constant" + "public_class_method" + "public_constant" "refine" "using") 'symbols)) |