summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog21
-rw-r--r--lisp/emacs-lisp/smie.el4
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))