changeset 60694:9e7ee067df09

*** empty log message ***

--- a/etc/NEWS	Fri Mar 18 00:13:40 2005 +0000
+++ b/etc/NEWS	Fri Mar 18 00:15:23 2005 +0000
@@ -110,14 +110,23 @@
 commands cp, mv, and ln follow.)  Thus, M-x copy-file RET ~/foo RET
 /tmp RET copies ~/foo to /tmp/foo.
 
+** M-o now is the prefix key for setting text properties;
+M-o M-o requests refontification.
+
+** M-g is now a prefix key.  M-g g and M-g M-g run goto-line.
+
+** font-lock-lines-before specifies a number of lines before the
+current line that should be refontified when you change the buffer.
+The default value is 1.
+
 ** C-u M-x goto-line now switches to the most recent previous buffer,
 and goes to the specified line in that buffer.
 
 When goto-line starts to execute, if there's a number in the buffer at
 point then it acts as the default argument for the minibuffer.
 
-** Emacs now responds to mouse-clicks on the mode-line, header-line and
-display margin, when run in an xterm.
+** Emacs now responds to mouse-clicks on the mode-line, header-line
+and display margin, when run in an xterm.
 
 ** M-SPC (just-one-space) when given a numeric argument N
 converts whitespace around point to N spaces.
@@ -2533,10 +2542,20 @@
 
 * Lisp Changes in Emacs 22.1
 
-** An element of buffer-undo-list can now have the form (FUNNAME .
-ARGS), where FUNNAME is a symbol other than t or nil.  That stands for
-a high-level change that should be undone by evaluating (apply FUNNAME
-ARGS).
++++
+** The new interactive-specification `G' reads a file name
+much like `F', but if the input is a directory name (even defaulted),
+it returns just the directory name.
+
++++
+** An element of buffer-undo-list can now have the form (apply FUNNAME
+. ARGS), where FUNNAME is a symbol other than t or nil.  That stands
+for a high-level change that should be undone by evaluating (apply
+FUNNAME ARGS).
+
+These entries can also have the form (apply DELTA BEG END FUNNAME . ARGS)
+which indicates that the change which took place was limited to the
+range BEG...END and increased the buffer size by DELTA.
 
 +++
 ** The line-move, scroll-up, and scroll-down functions will now
@@ -12284,7 +12303,7 @@
 this feature is enabled subsequent lines in the buffer will be correctly
 refontified to reflect their new syntactic context.  Previously, only the line
 containing the deleted character would be refontified and you would have to use
-the command M-g M-g (font-lock-fontify-block) to refontify some lines.
+the command M-o M-o (font-lock-fontify-block) to refontify some lines.
 
 As a consequence of this new feature, two other variables have changed:
 

--- a/lisp/ChangeLog	Fri Mar 18 00:13:40 2005 +0000
+++ b/lisp/ChangeLog	Fri Mar 18 00:15:23 2005 +0000
@@ -1,3 +1,48 @@
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* progmodes/perl-mode.el (perl-mode-hook): Defvar it.
+	(perl-mode): Use run-mode-hooks.
+
+	* mail/rmail.el (rmail-movemail-program, rmail-pop-password)
+	(rmail-pop-password-required, rmail-remote-password): Doc fixes.
+	(rmail-preserve-inbox, rmail-probe, rmail-autodetect): Doc fix.
+
+	* mail/sendmail.el (sendmail-send-it): Reenaable the code
+	to compute resend-to-address and use it.
+
+	* tar-mode.el (tar-mode): Turn off undo unconditionally.
+
+	* image-mode.el: New file.
+
+	* image.el (insert-sliced-image): Add autoload cookie.
+
+	* font-lock.el (font-lock-lines-before): New user option.
+	(font-lock-after-change-function): Obey it.
+
+	* bindings.el (esc-map): Make M-g a prefix.
+	Bind M-g g and M-g M-g to goto-line.
+
+	* progmodes/perl-mode.el (perl-mode): Use run-mode-hooks.
+
+	* faces.el (face-id): Doc fix.
+
[phone]  Frederik Fouvry  <[e-mail]>
+
+	* mail/rmail.el (rmail-unknown-mail-followup-to): New function.
+	(rmail-show-message): Use rmail-unknown-mail-followup-to.
+	(rmail-reply): Recognize Mail-Followup-To and Mail-Reply-To headers.
+
+	* mail/sendmail.el (mail-yank-ignored-headers)
+	(mail-font-lock-keywords, mail-mode-fill-paragraph):
+	Add Mail-Followup-To and Mail-Reply-To headers.
+	(mail-citation-hook): Add autoload cookie.
+	(mail-mode): Doc fix.
+	(mail-mode-map): Bind mail-mail-followup-to and mail-mail-reply-to.
+	(mail-send): Compute Mail-Followup-To and Mail-Reply-To headers.
+	(mail-mode-fill-paragraph): Handle those headers.
+	(mail-mailing-lists): New variable.
+	(mail-mail-reply-to, mail-mail-followup-to): New functions.
+
 2005-03-17  Juri Linkov  <[e-mail]>
 
 	* isearch.el (isearch-fallback): Check for `(car previous)'
@@ -176,7 +221,7 @@
 2005-03-11  Kenichi Handa  <[e-mail]>
 
 	* international/mule.el (make-coding-system): Set property
-	'coding-system-define-form to nil.
+	coding-system-define-form to nil.
 	(define-coding-system-alias): Likewise.
 
 2005-03-11  Kenichi Handa  <[e-mail]>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/image-mode.el	Fri Mar 18 00:15:23 2005 +0000
@@ -0,0 +1,112 @@
+;;; image-mode.el --- support for visiting image files
+;;
+;; Copyright (C) 2005 Free Software Foundation, Inc.
+;;
+;; Author: Richard Stallman <[e-mail]>
+;; Keywords: multimedia
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;; Defines a major mode for visiting image files
+;; that allows conversion between viewing the text of the file
+;; and viewing the file as an image.  Viewing the image
+;; works by putting a `display' text-property on the
+;; image data, with the image-data still present underneath; if the
+;; resulting buffer file is saved to another name it will correctly save
+;; the image data to the new file.
+
+;;; Code:
+
+(require 'image)
+
+;;;###autoload (push '("\\.jpg\\'" . image-mode) auto-mode-alist)
+;;;###autoload (push '("\\.jpeg\\'" . image-mode) auto-mode-alist)
+;;;###autoload (push '("\\.gif\\'" . image-mode) auto-mode-alist)
+;;;###autoload (push '("\\.png\\'" . image-mode) auto-mode-alist)
+;;;###autoload (push '("\\.tiff\\'" . image-mode) auto-mode-alist)
+;;;###autoload (push '("\\.tif\\'" . image-mode) auto-mode-alist)
+;;;###autoload (push '("\\.xbm\\'" . image-mode) auto-mode-alist)
+;;;###autoload (push '("\\.pbm\\'" . image-mode) auto-mode-alist)
+;;;###autoload (push '("\\.pgm\\'" . image-mode) auto-mode-alist)
+;;;###autoload (push '("\\.ppm\\'" . image-mode) auto-mode-alist)
+;;;###autoload (push '("\\.pnm\\'" . image-mode) auto-mode-alist)
+
+(defvar image-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\C-c\C-c" 'image-toggle-display)
+    map)
+  "Major mode keymap for Image mode.")
+
+;;;###autoload
+(defun image-mode ()
+  "Major mode for image files.
+You can use \\<image-mode-map>\\[image-toggle-display]
+to toggle between display as an image and display as text."
+  (interactive)
+  (kill-all-local-variables)
+  (setq mode-name "Image")
+  (setq major-mode 'image-mode)
+  (use-local-map image-mode-map)
+  (run-mode-hooks 'image-mode-hook)
+  (message (substitute-command-keys
+	    "Type \\[image-toggle-display] to view the image as an image.")))
+
+(defun image-toggle-display ()
+  "Start or stop displaying an image file as the actual image.
+This command toggles between showing the text of the image file
+and showing the image as an image."
+  (interactive)
+  (if (get-text-property (point-min) 'display)
+      (let ((inhibit-read-only t)
+	    (buffer-undo-list t))
+	(remove-list-of-text-properties (point-min) (point-max)
+					'(display intangible read-nonsticky
+						  read-only front-sticky))
+	(kill-local-variable 'cursor-type)
+	(kill-local-variable 'truncate-lines)
+	(message "Repeat this command to go back to displaying the image"))
+    ;; Turn the image data into a real image, but only if the whole file
+    ;; was inserted
+    (let* ((data
+	    (string-make-unibyte
+	     (buffer-substring-no-properties (point-min) (point-max))))
+	   (image
+	    (create-image data nil t))
+	   (props
+	    `(display ,image
+		      intangible ,image
+		      rear-nonsticky (display intangible)
+		      ;; This a cheap attempt to make the whole buffer
+		      ;; read-only when we're visiting the file (as
+		      ;; opposed to just inserting it).
+		      read-only t front-sticky (read-only)))
+	   (buffer-undo-list t))
+      (add-text-properties (point-min) (point-max) props)
+      ;; Inhibit the cursor when the buffer contains only an image,
+      ;; because cursors look very strange on top of images.
+      (setq cursor-type nil)
+      ;; This just makes the arrow displayed in the right fringe
+      ;; area look correct when the image is wider than the window.
+      (setq truncate-lines t)
+      (message "Repeat this command to go back to displaying the file as text"))))
+
+(provide 'image-mode)
+
+;;; image-mode.el ends here

--- a/lispref/ChangeLog	Fri Mar 18 00:13:40 2005 +0000
+++ b/lispref/ChangeLog	Fri Mar 18 00:15:23 2005 +0000
@@ -1,5 +1,7 @@
 2005-03-17  Richard M. Stallman  <[e-mail]>
 
+	* text.texi (Undo): Document extensible undo entries.
+
 	* searching.texi (String Search, Regexp Search, Regexp Search):
 	Cleanups.
 

--- a/src/ChangeLog	Fri Mar 18 00:13:40 2005 +0000
+++ b/src/ChangeLog	Fri Mar 18 00:15:23 2005 +0000
@@ -1,3 +1,17 @@
[phone]  Richard M. Stallman  <[e-mail]>
+
+	* dispnew.c (mirror_line_dance): Set W2 according to FRAME_FROM.
+
+	* fileio.c (Fcopy_file, Frename_file, Fadd_name_to_file)
+	(Fmake_symbolic_link): Use G to read the new file name.
+
+	* callint.c (Finteractive): Document G option.
+	(Fcall_interactively): Implement G option.
+
+	* buffer.c (buffer_lisp_local_variables): New function,
+	broken out from Fbuffer_local_variables.
+	(clone_per_buffer_values): Use buffer_lisp_local_variables.
+
 2005-03-17  Stefan Monnier  <[e-mail]>
 
 	* xfns.c (xic_create_fontsetname): Add `motif' argument.