Merged in changes from CVS HEAD

Patches applied:

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

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


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-45

9 files changed, 58 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de4f72cc020..14963f0ef8c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,38 @@
+2004-01-04  Karl Berry  <karl@gnu.org>
+
+        * emacs-lisp/copyright.el (copyright-regexp): allow the common
+        comment characters % and # in the copyright year notice,
+        as well as ;.
+
+2004-01-04  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+        * wid-edit.el (default): Define dummy :value-delete.
+        Reported by Jesper Harder <harder@ifa.au.dk>.
+
+2004-01-03  Richard M. Stallman  <rms@gnu.org>
+
+        * progmodes/compile.el (compile-internal): Use point, not point-min,
+        for set-window-point.
+
+        * textmodes/tex-mode.el (latex-find-indent): Avoid error at end of buf.
+
+        * emacs-lisp/lisp-mnt.el (lm-section-end): require outline.
+
+        * progmodes/grep.el (grep-mode-map):
+        Don't remap next-line, previous-line.
+
+2004-01-03  Eric M. Ludlam  <eric@siege-engine.com>
+
+        * speedbar.el (speedbar-edit-line): Change regexp to position
+        the cursor on the first character of this line's button.
+
+2004-01-03  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * subr.el (functionp): Doc fix.
+
 2004-01-03  Jesper Harder  <harder@ifa.au.dk>  (tiny change)
 
-        * progmodes/idlwave.el (idlwave-make-tags): 
+        * progmodes/idlwave.el (idlwave-make-tags):
         * textmodes/flyspell.el (flyspell-large-region):.
         * progmodes/make-mode.el (makefile-query-by-make-minus-q):
         * emulation/viper-util.el (viper-glob-unix-files):
@@ -69,6 +101,9 @@
 
 2003-12-29  Richard M. Stallman  <rms@gnu.org>
 
+        * mail/mail-utils.el (mail-unquote-printable-hexdigit):
+        Upcase the character.
+
         * textmodes/flyspell.el (mail-mode-flyspell-verify):
         Search for header separator alone on a line, literally,
         and search for it backward, not forward.
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index fc0a5b74726..4532f7e5b77 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -1,6 +1,6 @@
 ;;; copyright.el --- update the copyright notice in current buffer
 
-;; Copyright (C) 1991, 92, 93, 94, 95, 1998, 2001, 2003
+;; Copyright (C) 1991, 92, 93, 94, 95, 1998, 2001, 2003, 2004
 ;;           Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
@@ -47,7 +47,7 @@ A value of nil means to search whole buffer."
 (defcustom copyright-regexp
  "\\([����]\\|@copyright{}\\|[Cc]opyright\\s *:?\\s *\\(?:(C)\\)?\
 \\|[Cc]opyright\\s *:?\\s *[����]\\)\
-\\s *\\([1-9]\\([-0-9, ';\n\t]\\|\\s<\\|\\s>\\)*[0-9]+\\)"
+\\s *\\([1-9]\\([-0-9, ';%#\n\t]\\|\\s<\\|\\s>\\)*[0-9]+\\)"
   "*What your copyright notice looks like.
 The second \\( \\) construct must match the years."
   :group 'copyright
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index aeb7fb2258d..245772dfc54 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -214,6 +214,7 @@ The end of the section is defined as the beginning of the next
 section of the same level or lower.  The function
 `lisp-outline-level' is used to compute the level of a section.
 If no such section exists, return the end of the buffer."
+  (require 'outline)   ;; for outline-regexp.
   (let ((start (lm-section-start header)))
     (when start
       (save-excursion
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 6d76fe3384a..de050411411 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -754,7 +754,7 @@ Returns the compilation buffer created."
               compilation-directory-stack (list default-directory))
         (set-window-start outwin (point-min))
         (or (eq outwin (selected-window))
-            (set-window-point outwin (point-min)))
+            (set-window-point outwin (point)))
         ;; The setup function is called before compilation-set-window-height
         ;; so it can set the compilation-window-height buffer locally.
         (if compilation-process-setup-function
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 35a5780aa45..cb8fcf6e042 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -157,8 +157,9 @@ The following place holders should be present in the string:
     (define-key map " " 'scroll-up)
     (define-key map "\^?" 'scroll-down)
 
-    (define-key map [remap next-line] 'compilation-next-error)
-    (define-key map [remap previous-line] 'compilation-previous-error)
+    ;; This is intolerable -- rms
+;;;    (define-key map [remap next-line] 'compilation-next-error)
+;;;    (define-key map [remap previous-line] 'compilation-previous-error)
 
     (define-key map "\r" 'compile-goto-error)  ;; ?
     (define-key map "n" 'next-error-no-select)
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 5eef1359fad..f8e9386585d 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -3410,7 +3410,9 @@ directory with these items."
         (if (re-search-forward "[]>?}] [^ ]"
                                (save-excursion (end-of-line) (point))
                                t)
-            (speedbar-do-function-pointer)
+            (progn
+              (forward-char -1)
+              (speedbar-do-function-pointer))
           nil))
       (speedbar-do-function-pointer)))
 
diff --git a/lisp/subr.el b/lisp/subr.el
index a2b09d6b63b..b251ab6573a 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2205,7 +2205,10 @@ configuration."
        (eq (car object) 'frame-configuration)))
 
 (defun functionp (object)
-  "Non-nil iff OBJECT is a type of object that can be called as a function."
+  "Non-nil if OBJECT is any kind of function or a special form.
+Also non-nil if OBJECT is a symbol and its function definition is
+\(recursively) a function or special form.  This does not include
+macros."
   (or (and (symbolp object) (fboundp object)
            (condition-case nil
                (setq object (indirect-function object))
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 87dc8fcbc00..68b408af081 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -2342,15 +2342,15 @@ There might be text before point."
          (+ indent (current-column) tex-indent-item))
         (t
          (let ((col (current-column)))
-           (if (not (eq (char-syntax char) ?\())
+           (if (or (null char) (not (eq (char-syntax char) ?\()))
                ;; If the first char was not an open-paren, there's
                ;; a risk that this is really not an argument to the
                ;; macro at all.
-                 (+ indent col)
-               (forward-sexp 1)
-               (if (< (line-end-position)
-                      (save-excursion (forward-comment (point-max))
-                                      (point)))
+               (+ indent col)
+             (forward-sexp 1)
+             (if (< (line-end-position)
+                    (save-excursion (forward-comment (point-max))
+                                    (point)))
                  ;; we're indenting the first argument.
                  (min (current-column) (+ tex-indent-arg col))
                (skip-syntax-forward " ")
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 63a254d1d67..2392ccdfb47 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -1,6 +1,6 @@
 ;;; wid-edit.el --- Functions for creating and using widgets -*-byte-compile-dynamic: t;-*-
 ;;
-;; Copyright (C) 1996,97,1999,2000,01,02,2003  Free Software Foundation, Inc.
+;; Copyright (C) 1996,97,1999,2000,01,02,2003, 2004  Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
@@ -1348,6 +1348,7 @@ The value of the :type attribute should be an unconverted widget type."
   :copy 'identity
   :value-set 'widget-default-value-set
   :value-inline 'widget-default-value-inline
+  :value-delete 'ignore
   :default-get 'widget-default-default-get
   :menu-tag-get 'widget-default-menu-tag-get
   :validate #'ignore