6 files changed, 73 insertions, 4 deletions

diff --git a/etc/NEWS b/etc/NEWS
index e594743f354..92ef1896bce 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -2459,10 +2459,6 @@ arg is non-nil.
 modification times.  Magic file name handlers can handle this
 operation.
 
-** file-remote-p now returns an identifier for the remote system,
-if the file is indeed remote.  (Before, the return value was t in
-this case.)
-
 +++
 ** The display space :width and :align-to text properties are now
 supported on text terminals.
@@ -3228,6 +3224,7 @@ will only show directories.
 ** The new function `file-remote-p' tests a file name and returns
 non-nil if it specifies a remote file (one that Emacs accesses using
 its own special methods and not directly through the file system).
+The value in that case is an identifier for the remote file system.
 
 ---
 ** When a Lisp file uses CL functions at run-time, compiling the file
diff --git a/etc/TODO b/etc/TODO
index 21a7c7d8dc0..e9bfbb01009 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -150,6 +150,10 @@ to the FSF.
 ** Implement popular parts of the rest of the CL functions as compiler
   macros in cl-macs.
 
+** Make compiler warnings about functions that might be undefined at run time
+ smarter, so that they know which files are required by the file being
+ compiled and don't warn about functions defined in them.
+
 ** Highlight rectangles (`mouse-track-rectangle-p' in XEmacs).  Already in CUA,
   but it's a valuable feature worth making more general.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fadb854f739..e7117250422 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,40 @@
+2004-11-24  Richard M. Stallman  <rms@gnu.org>
+
+        * textmodes/ispell.el (ispell-check-version):
+        If default-directory is nonexistent, use home dir.
+
+        * progmodes/grep.el (grep-regexp-alist):
+        Don't match parens around line numbers.
+
+        * progmodes/cperl-mode.el (cperl-indent-region)
+        (cperl-imenu--create-perl-index, cperl-xsub-scan): 
+        Don't print progress messages.
+
+        * progmodes/compile.el (compilation-mode-map):
+        Don't inherit from compilation-minor-mode-map;
+        copy its bindings instead.  But the menu bar Compile
+        entry now does inherit from compilation-menu-map.
+
+        * emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
+        Use with-no-warnings around compiler-macroexpand.
+
+        * imenu.el: Don't always require newcomment.
+        (imenu--generic-function): Call comment-normalize-vars
+        if we have a comment syntax.
+        Exit the loop if REGEXP matches the null string.
+        Test comment-start as well as comment-start-skip
+        when deciding whether to check for comments.
+
+        * tooltip.el (tooltip-mode): Doc fix.
+
+        * term.el (term-escape-char, term-mode): Doc fixes.
+
+2004-11-24  Dave Love  <fx@gnu.org>
+
+        * progmodes/python.el (python-font-lock-syntactic-keywords):
+        Check for escapes in the regexp.
+        (python-quote-syntax): Don't do it here.
+
 2004-11-25  Nick Roberts  <nickrob@snap.net.nz>
 
         * progmodes/gdb-ui.el (gdb-breakpoints-mode-map)
@@ -143,6 +180,7 @@
         * mail/emacsbug.el (report-emacs-bug): Catch error that x-server-vendor
         and x-server-version may throw.
 
+>>>>>>> 1.6662
 2004-11-23  Kim F. Storm  <storm@cua.dk>
 
         * subr.el (substitute-key-definition-key): Optimize.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 17ea9277518..f2750ec8ff4 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1080,6 +1080,9 @@ exited abnormally with code %d\n"
 
 (defvar compilation-mode-map
   (let ((map (make-sparse-keymap)))
+    ;; Don't inherit from compilation-minor-mode-map,
+    ;; because that introduces a menu bar item we don't want.
+    ;; That confuses C-down-mouse-3.
     (define-key map [mouse-2] 'compile-goto-error)
     (define-key map "\C-c\C-c" 'compile-goto-error)
     (define-key map "\C-m" 'compile-goto-error)
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 5bfe3793e73..1047855cebd 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,24 @@
+2004-11-24  Richard M. Stallman  <rms@gnu.org>
+
+        * processes.texi (Synchronous Processes): Grammar fix.
+
+        * numbers.texi (Comparison of Numbers): Add eql.
+
+        * locals.texi (Standard Buffer-Local Variables): Add many vars.
+
+        * intro.texi (Printing Notation): Fix previous change.
+
+        * display.texi (Customizing Bitmaps): Move indicate-buffer-boundaries
+        and default-indicate-buffer-boundaries from here.
+        (Usual Display): To here.
+        (Scroll Bars): Add scroll-bar-mode and scroll-bar-width.
+        (Usual Display): Move tab-width up.
+
+        * customize.texi (Variable Definitions): Replace
+        show-paren-mode example with tooltip-mode.
+        (Simple Types, Composite Types, Defining New Types): 
+        Minor cleanups.
+        
 2004-11-21  Jesper Harder  <harder@ifa.au.dk>
 
         * processes.texi (Synchronous Processes, Output from Processes):
diff --git a/src/ChangeLog b/src/ChangeLog
index 83ccf06ea00..1ea2198c171 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-24  Richard M. Stallman  <rms@gnu.org>
+
+        * coding.c (run_pre_post_conversion_on_str): Bind Qinhibit_read_only.
+
+        * buffer.c (syms_of_buffer) <indicate-buffer-boundaries>: Doc fix.
+
 2004-11-24  Kim F. Storm  <storm@cua.dk>
 
         * xdisp.c (move_it_in_display_line_to, display_line):