diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-29 14:14:15 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-03-29 14:14:15 -0700 |
| commit | 0479a1b62ceeb9586168146e2c8f49f2a5ebaf2f (patch) | |
| tree | 1fd646daf290a63564bd8823b8a0ba32e8190ae3 /lisp | |
| parent | 4a7004369824ea46fd5222a3f57cf3ee67e988e0 (diff) | |
| parent | 5e0314f6fabca1af214240177a28d3822d6ef3e5 (diff) | |
| download | emacs-0479a1b62ceeb9586168146e2c8f49f2a5ebaf2f.tar.gz | |
Merge from origin/emacs-24
5e0314f * smie.el (smie*ward-sexp-command): Don't pretend the arg is optional
13cf575 Don't round up scroll bar width with GTK3 (Bug#20182).
921dd0d * doc/lispref/objects.texi (Equality Predicates): Fix typo in example.
Conflicts:
doc/lispref/ChangeLog
lisp/ChangeLog
src/ChangeLog
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 21 | ||||
| -rw-r--r-- | lisp/emacs-lisp/smie.el | 4 |
2 files changed, 23 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c8e84a3c729..fd346f05afb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,24 @@ +2015-03-29 Stefan Monnier <monnier@iro.umontreal.ca> + + * emacs-lisp/smie.el (smie-backward-sexp-command) + (smie-forward-sexp-command): Don't pretend the arg is optional + (bug#20205). + +2015-03-29 Dmitry Gutov <dgutov@yandex.ru> + + * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): + Detect regexps after `!'. (Bug#19285) + + * progmodes/ruby-mode.el (ruby-font-lock-keywords): + Use `font-lock-constant-face' for nil, true and false. + Highlight `self' as a keyword. (Bug#17733) + +2015-03-29 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): + Expect beginning of regexp also after open brace or vertical bar. + (Bug#20026) + 2015-03-28 Jan Djärv <jan.h.d@swipnet.se> * emacs-lisp/package.el (package-refresh-contents): Fix spelling diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el index 48bded4e3a6..1bc5eb28720 100644 --- a/lisp/emacs-lisp/smie.el +++ b/lisp/emacs-lisp/smie.el @@ -837,12 +837,12 @@ Possible return values: ;;; Miscellaneous commands using the precedence parser. -(defun smie-backward-sexp-command (&optional n) +(defun smie-backward-sexp-command (n) "Move backward through N logical elements." (interactive "^p") (smie-forward-sexp-command (- n))) -(defun smie-forward-sexp-command (&optional n) +(defun smie-forward-sexp-command (n) "Move forward through N logical elements." (interactive "^p") (let ((forw (> n 0)) |