From 7346a407f45d7eaff6ef8742bc054b7e3a9c17c0 Mon Sep 17 00:00:00 2001
From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 18 Oct 2009 22:25:36 +0000
Subject: * 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.
---
 lisp/emacs-lisp/lisp-mode.el | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'lisp/emacs-lisp')

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index b9b7c6ad8f9..362c75a8caf 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -673,6 +673,11 @@ If CHAR is not a character, return nil."
 	  (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)
-- 
cgit v1.2.3