diff lisp/emacs-lisp/lisp-mode.el @ 90737:95d0cdf160ea

Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 586-614) - Update from CVS - Update from erc--emacs--22 - Merge from gnus--rel--5.10 - Merge from erc--main--0 - Make byte compiler correctly write circular constants * gnus--rel--5.10 (patch 186-196) - Update from CVS - Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
author Miles Bader <miles@gnu.org>
date Fri, 26 Jan 2007 06:16:11 +0000
parents 138ce2701550 7a3f13e2dd57
children 52a7f3f50b89
line wrap: on
line diff
--- a/lisp/emacs-lisp/lisp-mode.el	Fri Jan 26 02:30:28 2007 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el	Fri Jan 26 06:16:11 2007 +0000
@@ -1,7 +1,7 @@
 ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands
 
 ;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: lisp, languages
@@ -490,6 +490,8 @@
 	      (point (point)))
 	  (delete-region beg end)
 	  (insert (nth 1 value))
+	  (or (= beg point)
+	      (setq point (1- (point))))
 	  (last-sexp-setup-props beg (point)
 				 (nth 0 value)
 				 (nth 2 value)