[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112390: Merge from emacs-24; up to r
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112390: Merge from emacs-24; up to r111345 |
Date: |
Fri, 26 Apr 2013 00:34:54 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112390 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Fri 2013-04-26 00:34:54 -0700
message:
Merge from emacs-24; up to r111345
modified:
lisp/ChangeLog
lisp/emacs-lisp/syntax.el
lisp/subr.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-04-26 07:25:45 +0000
+++ b/lisp/ChangeLog 2013-04-26 07:34:54 +0000
@@ -1,5 +1,16 @@
2013-04-26 Glenn Morris <address@hidden>
+ * subr.el (read-number): Once more use `read' rather than
+ `string-to-number', to trap non-numeric input. (Bug#14254)
+
+2013-04-26 Erik Charlebois <address@hidden>
+
+ * emacs-lisp/syntax.el (syntax-propertize-multiline):
+ Use `syntax-multiline' text property consistently instead of
+ `font-lock-multiline'. (bug#14237).
+
+2013-04-26 Glenn Morris <address@hidden>
+
* emacs-lisp/shadow.el (list-load-path-shadows):
No longer necessary to check for duplicate simple.el, since
2012-07-07 change to init_lread to not include installation lisp
=== modified file 'lisp/emacs-lisp/syntax.el'
--- a/lisp/emacs-lisp/syntax.el 2013-01-01 09:11:05 +0000
+++ b/lisp/emacs-lisp/syntax.el 2013-04-22 14:11:37 +0000
@@ -99,7 +99,7 @@
(setq beg (or (previous-single-property-change beg 'syntax-multiline)
(point-min))))
;;
- (when (get-text-property end 'font-lock-multiline)
+ (when (get-text-property end 'syntax-multiline)
(setq end (or (text-property-any end (point-max)
'syntax-multiline nil)
(point-max))))
=== modified file 'lisp/subr.el'
--- a/lisp/subr.el 2013-04-18 00:12:33 +0000
+++ b/lisp/subr.el 2013-04-26 07:34:54 +0000
@@ -2225,7 +2225,7 @@
(condition-case nil
(setq n (cond
((zerop (length str)) default1)
- ((stringp str) (string-to-number str))))
+ ((stringp str) (read str))))
(error nil)))
(unless (numberp n)
(message "Please enter a number.")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112390: Merge from emacs-24; up to r111345,
Glenn Morris <=