[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/lisp ChangeLog minibuffer.el emacs-lisp/l...
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] emacs/lisp ChangeLog minibuffer.el emacs-lisp/l... |
Date: |
Sun, 18 Oct 2009 22:25:40 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 09/10/18 22:25:40
Modified files:
lisp : ChangeLog minibuffer.el
lisp/emacs-lisp: lisp-mode.el
lisp/textmodes : sgml-mode.el
Log message:
* minibuffer.el (read-file-name): Check for repeat before putting
a default argument in file-name-history (Bug#4657).
* emacs-lisp/lisp-mode.el (preceding-sexp): Recognize hash table
read syntax (Bug#4737).
* textmodes/sgml-mode.el (sgml-delete-tag): Use
sgml-looking-back-at.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16456&r2=1.16457
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/minibuffer.el?cvsroot=emacs&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/emacs-lisp/lisp-mode.el?cvsroot=emacs&r1=1.247&r2=1.248
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/textmodes/sgml-mode.el?cvsroot=emacs&r1=1.142&r2=1.143
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16456
retrieving revision 1.16457
diff -u -b -r1.16456 -r1.16457
--- ChangeLog 18 Oct 2009 04:06:32 -0000 1.16456
+++ ChangeLog 18 Oct 2009 22:25:36 -0000 1.16457
@@ -1,3 +1,14 @@
+2009-10-18 Chong Yidong <address@hidden>
+
+ * minibuffer.el (read-file-name): Check for repeat before putting
+ a default argument in file-name-history (Bug#4657).
+
+ * emacs-lisp/lisp-mode.el (preceding-sexp): Recognize hash table
+ read syntax (Bug#4737).
+
+ * textmodes/sgml-mode.el (sgml-delete-tag): Use
+ sgml-looking-back-at.
+
2009-10-18 Aaron S. Hawley <address@hidden>
* textmodes/sgml-mode.el (sgml-tag-help): Prompt user for tag.
Index: minibuffer.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/minibuffer.el,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- minibuffer.el 15 Oct 2009 01:50:23 -0000 1.87
+++ minibuffer.el 18 Oct 2009 22:25:39 -0000 1.88
@@ -1289,12 +1289,16 @@
(if replace-in-history
;; Replace what Fcompleting_read added to the history
- ;; with what we will actually return.
+ ;; with what we will actually return. As an exception,
+ ;; if that's the same as the second item in
+ ;; file-name-history, it's really a repeat (Bug#4657).
(let ((val1 (minibuffer--double-dollars val)))
(if history-delete-duplicates
(setcdr file-name-history
(delete val1 (cdr file-name-history))))
- (setcar file-name-history val1))
+ (if (string= val1 (cadr file-name-history))
+ (pop file-name-history)
+ (setcar file-name-history val1)))
(if add-to-history
;; Add the value to the history--but not if it matches
;; the last value already there.
Index: emacs-lisp/lisp-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/emacs-lisp/lisp-mode.el,v
retrieving revision 1.247
retrieving revision 1.248
diff -u -b -r1.247 -r1.248
--- emacs-lisp/lisp-mode.el 27 Sep 2009 23:25:07 -0000 1.247
+++ emacs-lisp/lisp-mode.el 18 Oct 2009 22:25:40 -0000 1.248
@@ -673,6 +673,11 @@
(when (eq (preceding-char) ??)
(forward-char -1)))
+ ;; Skip over hash table read syntax.
+ (and (> (point) (1+ (point-min)))
+ (looking-back "#s" (- (point) 2))
+ (forward-char -2))
+
;; Skip over `#N='s.
(when (eq (preceding-char) ?=)
(let (labeled-p)
Index: textmodes/sgml-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/sgml-mode.el,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -b -r1.142 -r1.143
--- textmodes/sgml-mode.el 18 Oct 2009 04:06:34 -0000 1.142
+++ textmodes/sgml-mode.el 18 Oct 2009 22:25:40 -0000 1.143
@@ -909,7 +909,7 @@
(kill-sexp 1))
(setq open (point))
(when (and (sgml-skip-tag-forward 1)
- (not (looking-back "/>")))
+ (not (sgml-looking-back-at "/>")))
(kill-sexp -1)))
;; Delete any resulting empty line. If we didn't kill-sexp,
;; this *should* do nothing, because we're right after the tag.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/lisp ChangeLog minibuffer.el emacs-lisp/l...,
Chong Yidong <=