Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-75

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-717
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-718
   RCS keyword removal

8 files changed, 36 insertions, 14 deletions

diff --git a/etc/TODO b/etc/TODO
index 544e42694fc..5c674c5c06e 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -315,8 +315,6 @@ to the FSF.
 
 * Internal changes
 
-** Replace Emacs's regex.c with the new DFA-based glibc regex code.
-
 ** Replace gmalloc.c with the modified Doug Lea code from the current
   GNU libc so that the special mmapping of buffers can be removed --
   that apparently loses under Solaris, at least.  [fx has mostly done
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3c1e7140b3..db884f5af3b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,22 @@
-2004-12-06  Stefan  <monnier@iro.umontreal.ca>
+2004-12-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * isearch.el (isearch-quote-char): Fix up typo in last change.
+
+2004-12-07  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * mouse.el (mouse-set-font): Handle the case where the command was
+        not invoked using the mouse.
+
+        * edmacro.el: `edit-kbd-macro' is now bound to `C-x C-k e'.
+        (edmacro-finish-edit): Further update for keyboard macros that are
+        lambda forms.
+        (edmacro-sanitize-for-string): Correctly remove Meta modifier
+        (as suggested by Kim Storm).
+
+2004-12-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * font-lock.el (font-lock-unfontify-region): Save buffer state.
-        (font-lock-default-unfontify-region): Don't save buffer state any
-        more.
+        (font-lock-default-unfontify-region): Don't save buffer state any more.
 
 2004-12-07  Jay Belanger  <belanger@truman.edu>
 
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index b40cbaafe2d..09872f3ef2c 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -1,6 +1,6 @@
 ;;; edmacro.el --- keyboard macro editor
 
-;; Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2004 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Maintainer: Dave Gillespie <daveg@synaptics.com>
@@ -28,7 +28,7 @@
 
 ;;; Usage:
 ;;
-;; The `C-x C-k' (`edit-kbd-macro') command edits a keyboard macro
+;; The `C-x C-k e' (`edit-kbd-macro') command edits a keyboard macro
 ;; in a special buffer.  It prompts you to type a key sequence,
 ;; which should be one of:
 ;;
@@ -266,7 +266,8 @@ or nil, use a compact 80-column format."
                             (and b (commandp b) (not (arrayp b))
                                  (not (kmacro-extract-lambda b))
                                  (or (not (fboundp b))
-                                     (not (arrayp (symbol-function b))))
+                                     (not (or (arrayp (symbol-function b))
+                                              (get b 'kmacro))))
                                  (not (y-or-n-p
                                        (format "Key %s is already defined; %s"
                                                (edmacro-format-keys key 1)
@@ -655,7 +656,7 @@ The string represents the same events; Meta is indicated by bit 7.
 This function assumes that the events can be stored in a string."
   (setq seq (copy-sequence seq))
   (loop for i below (length seq) do
-        (when (< (aref seq i) 0)
+        (when (logand (aref seq i) 128)
           (setf (aref seq i) (logand (aref seq i) 127))))
   seq)
 
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 622392e18ad..e8bb47509be 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1678,7 +1678,7 @@ Isearch mode."
     ;; single-byte character set, and convert them to Emacs
     ;; characters.
     (if (and isearch-regexp (= char ?\ ))
-        (if (subregexp-context-p isearch-string pos)
+        (if (subregexp-context-p isearch-string (length isearch-string))
             (isearch-process-search-string "[ ]" " ")
           (isearch-process-search-char char))
       (and enable-multibyte-characters
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 912048cd1de..b2fa71dde24 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -2201,7 +2201,9 @@ and selects that window."
    (progn (unless (display-multi-font-p)
             (error "Cannot change fonts on this display"))
           (x-popup-menu
-           last-nonmenu-event
+           (if (listp last-nonmenu-event)
+               last-nonmenu-event
+             (list '(0 0) (selected-window)))
            ;; Append list of fontsets currently defined.
            (append x-fixed-font-alist (list (generate-fontset-menu))))))
   (if fonts
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 1c1450f47e8..fc1ffb329d9 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -5,7 +5,7 @@
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar
 ;; Homepage: http://www.astro.uva.nl/~dominik/Tools/org/
-;; Version: 3.03  (internal CVS version is $Revision: 1.3 $)
+;; Version: 3.03
 
 ;; This file is part of GNU Emacs.
 
diff --git a/man/ChangeLog b/man/ChangeLog
index 24c322facd1..b601faef550 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-07  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * frames.texi (Scroll Bars): The option `scroll-bar-mode' has to
+        be set through Custom.  Otherwise, it has no effect.
+
 2004-12-07  Stefan  <monnier@iro.umontreal.ca>
 
         * url.texi: New file.
diff --git a/man/frames.texi b/man/frames.texi
index 5fb4181408e..e9716c76a1f 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -761,8 +761,10 @@ argument is positive.  This command applies to all frames, including
 frames yet to be created.  Customize the option @code{scroll-bar-mode}
 to control the use of scroll bars at startup.  You can use it to specify
 that they are placed at the right of windows if you prefer that.  You
-can use the X resource @samp{verticalScrollBars} to control the initial
-setting of Scroll Bar mode similarly.  @xref{Resources}.
+have to set this variable through the @samp{Customize} interface
+(@pxref{Easy Customization}).  Otherwise, it will not work properly.
+You can use the X resource @samp{verticalScrollBars} to control the
+initial setting of Scroll Bar mode similarly.  @xref{Resources}.
 
 @findex toggle-scroll-bar
   To enable or disable scroll bars for just the selected frame, use the