summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/emacs-lisp/lisp-mode.el2
2 files changed, 13 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 66ef44650d5..af7cb76df6b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2004-08-28 Richard M. Stallman <rms@gnu.org>
+
+ * progmodes/grep.el (grep-default-command): Use find-tag-default.
+ (grep-tag-default): Function deleted.
+
+ * subr.el (find-tag-default): Moved from etags.el.
+
+ * progmodes/etags.el (find-tag-default): Moved to subr.el.
+
+ * emacs-lisp/lisp-mode.el (prin1-char): Put `shift' modifier
+ into the basic character if it has an uppercase form.
+
2004-08-27 Kenichi Handa <handa@m17n.org>
* international/utf-8.el (utf-8-post-read-conversion): If the
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index bcc9c2a89a7..d6f601cd121 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -363,7 +363,7 @@ if that value is non-nil."
(when (stringp default)
(if (string-match ":+" default)
(substring default (match-end 0))
- default))))
+ default))))
;; Used in old LispM code.
(defalias 'common-lisp-mode 'lisp-mode)