# HG changeset patch # User Miles Bader # Date 1177732021 0 # Node ID d823156fd54787ac4c7f56528313c255b4ed7170 # Parent 591a9ac5b183700a995a466fcc86bf3b7b8acd5b# Parent f04e87d62473b136a26c27a296d7a00b51e483c6 Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (base, patch 1-2) - tag of emacs@sv.gnu.org/emacs--devo--0--patch-709 - Sync to CVS tag EMACS_22_BRANCHPOINT - Sync to CVS branch EMACS_22_BASE 2007-04-25 Richard Stallman * lisp/hi-lock.el (hi-lock-file-patterns-policy): Default to `ask'. 2007-04-24 Richard Stallman * lispref/text.texi (Special Properties): Add xref to Overlay Properties. * lispref/display.texi (Overlay Properties): Add xref to Special Properties. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-716 diff -r 591a9ac5b183 -r d823156fd547 AUTHORS --- a/AUTHORS Fri Apr 27 19:34:22 2007 +0000 +++ b/AUTHORS Sat Apr 28 03:47:01 2007 +0000 @@ -333,10 +333,10 @@ url-file.el url-handlers.el url-http.el url-nfs.el Chong Yidong: changed cus-edit.el simple.el files.el custom.el - display.texi longlines.el xdisp.c files.texi keyboard.c compile.el - custom.texi info.el text.texi frames.texi image-mode.el mouse.el + display.texi longlines.el xdisp.c files.texi info.el keyboard.c + compile.el custom.texi text.texi frames.texi image-mode.el mouse.el misc.texi startup.el wid-edit.el xterm.c cus-theme.el - and 296 other files + and 295 other files Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c hp9000s300.h keyboard.c process.c texinfmt.el emacsclient.c sort.el @@ -456,10 +456,9 @@ Dave Love: wrote autoarg.el autoconf.el benchmark.el cfengine.el code-pages.el elide-head.el georgian.el hl-line.el latin-8.el - latin-9.el latin1-disp.el python.el refill.el rfc1345.el sgml-input.el - smiley.el subst-big5.el subst-gb2312.el subst-jis.el subst-ksc.el - tool-bar.el ucs-tables.el uni-input.el utf-16.el utf-7.el utf-8-lang.el - welsh.el + latin-9.el latin1-disp.el refill.el rfc1345.el sgml-input.el smiley.el + subst-big5.el subst-gb2312.el subst-jis.el subst-ksc.el tool-bar.el + ucs-tables.el uni-input.el utf-16.el utf-7.el utf-8-lang.el welsh.el and changed configure.in Makefile.in help.el fortran.el browse-url.el mule-cmds.el simple.el xterm.c cus-edit.el files.el info.el mule.el wid-edit.el fns.c vc.el rfc2047.el bindings.el cus-start.el buffer.c @@ -1728,7 +1727,7 @@ Masayuki Fujii: changed dnd.el w32-win.el Mathias Dahl: wrote image-dired.el -and changed dired.el dired.texi +and changed tumme.el dired.el dired.texi Mathias Megyei: changed Makefile.in @@ -2399,8 +2398,8 @@ Skip Collins: changed w32fns.c w32term.c w32term.h -Slawomir Nowaczyk: changed emacs.py python.el TUTORIAL.pl flyspell.el - ls-lisp.el w32proc.c +Slawomir Nowaczyk: changed python.el TUTORIAL.pl flyspell.el ls-lisp.el + w32proc.c Spencer Thomas: changed dabbrev.el emacsclient.c emacsserver.c gnus.texi server.el tcp.c unexec.c @@ -2460,7 +2459,7 @@ Steven E. Harris: changed nnheader.el -Steven Huwig: changed emacs.py python.el +Steven Huwig: changed python.el Steven L. Baur: wrote earcon.el footnote.el gnus-audio.el gnus-setup.el and changed gnus-xmas.el gnus-msg.el add-log.el dgnushack.el edebug.el diff -r 591a9ac5b183 -r d823156fd547 INSTALL --- a/INSTALL Fri Apr 27 19:34:22 2007 +0000 +++ b/INSTALL Sat Apr 28 03:47:01 2007 +0000 @@ -298,13 +298,13 @@ --without-png for PNG image support Use --without-toolkit-scroll-bars to disable LessTif/Motif or Xaw3d -scroll bars. +scroll bars. Use --without-xim to inhibit the default use of X Input Methods. In this case, the X resource useXIM can be used to turn on use of XIM. Use --disable-largefile omits support for files larger than 2GB on -systems which support that. +systems which support that. Use --without-sound to disable sound support. @@ -384,10 +384,10 @@ switch to the compiler, and link against libfoo.a and libbar.a libraries in addition to the standard ones. -For some libraries, like Gtk+, fontconfig and ALSA, `configure' use -pkg-config to find where those libraries are installed. -If you want pkg-config to look in special directories, you have to set -the environment variable PKG_CONFIG_PATH to point to the directories +For some libraries, like Gtk+, fontconfig and ALSA, `configure' use +pkg-config to find where those libraries are installed. +If you want pkg-config to look in special directories, you have to set +the environment variable PKG_CONFIG_PATH to point to the directories where the .pc-files for those libraries are. For example: diff -r 591a9ac5b183 -r d823156fd547 admin/FOR-RELEASE --- a/admin/FOR-RELEASE Fri Apr 27 19:34:22 2007 +0000 +++ b/admin/FOR-RELEASE Sat Apr 28 03:47:01 2007 +0000 @@ -50,6 +50,15 @@ ** angeli@caeruleus.net, April 23: Excessive refontification when setting jit-lock-context-unfontify-pos +** michael.ewe@arcor.de, Apr 24: 22.0.98 not starting on Solaris 10/I386 + +** rgm@gnu.org, Apr 24: [Stephen.Berman@gmx.net: Re: redisplay] + Gives test case for problem that a dialog box blocks redisplay. + +** Spurious redisplay bug not fixed. + +** mituharu@math.s.chiba-u.ac.jp, Apr 25: Cursors in fringe not redrawn by expose events. + * DOCUMENTATION ** Check the Emacs Tutorial. diff -r 591a9ac5b183 -r d823156fd547 etc/MORE.STUFF --- a/etc/MORE.STUFF Fri Apr 27 19:34:22 2007 +0000 +++ b/etc/MORE.STUFF Sat Apr 28 03:47:01 2007 +0000 @@ -86,6 +86,8 @@ * PS-print: + * Python mode: + * QuickURL: * RefTeX: diff -r 591a9ac5b183 -r d823156fd547 etc/NEWS --- a/etc/NEWS Fri Apr 27 19:34:22 2007 +0000 +++ b/etc/NEWS Sat Apr 28 03:47:01 2007 +0000 @@ -31,8 +31,12 @@ Some specific packages that are known to cause problems are: ** Semantic (used by CEDET, ECB, JDEE): upgrade to latest version. + ** cua.el, cua-mode.el: remove old versions. +** python-mode.el: Use python.el, available at + http://www.emacswiki.org/cgi-bin/wiki/PythonMode + * Installation Changes in Emacs 22.1 @@ -1770,8 +1774,6 @@ ** GDB-Script-mode is used for files like .gdbinit. -** The new python.el package is used to edit Python and Jython programs. - ** The TCL package tcl-mode.el was replaced by tcl.el. This was actually done in Emacs-21.1, and was not documented. diff -r 591a9ac5b183 -r d823156fd547 etc/emacs.py --- a/etc/emacs.py Fri Apr 27 19:34:22 2007 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,232 +0,0 @@ -"""Definitions used by commands sent to inferior Python in python.el.""" - -# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. -# Author: Dave Love - -# 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., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. - -import os, sys, traceback, inspect, __main__ -from sets import Set - -__all__ = ["eexecfile", "eargs", "complete", "ehelp", "eimport", "modpath"] - -def format_exception (filename, should_remove_self): - type, value, tb = sys.exc_info () - sys.last_type = type - sys.last_value = value - sys.last_traceback = tb - if type is SyntaxError: - try: # parse the error message - msg, (dummy_filename, lineno, offset, line) = value - except: - pass # Not the format we expect; leave it alone - else: - # Stuff in the right filename - value = SyntaxError(msg, (filename, lineno, offset, line)) - sys.last_value = value - res = traceback.format_exception_only (type, value) - # There are some compilation errors which do not provide traceback so we - # should not massage it. - if should_remove_self: - tblist = traceback.extract_tb (tb) - del tblist[:1] - res = traceback.format_list (tblist) - if res: - res.insert(0, "Traceback (most recent call last):\n") - res[len(res):] = traceback.format_exception_only (type, value) - # traceback.print_exception(type, value, tb) - for line in res: print line, - -def eexecfile (file): - """Execute FILE and then remove it. - Execute the file within the __main__ namespace. - If we get an exception, print a traceback with the top frame - (ourselves) excluded.""" - # We cannot use real execfile since it has a bug where the file stays - # locked forever (under w32) if SyntaxError occurs. - # --- code based on code.py and PyShell.py. - try: - try: - source = open (file, "r").read() - code = compile (source, file, "exec") - # Other exceptions (shouldn't be any...) will (correctly) fall - # through to "final". - except (OverflowError, SyntaxError, ValueError): - # FIXME: When can compile() raise anything else than - # SyntaxError ???? - format_exception (file, False) - return - try: - exec code in __main__.__dict__ - except: - format_exception (file, True) - finally: - os.remove (file) - -def eargs (name, imports): - "Get arglist of NAME for Eldoc &c." - try: - if imports: exec imports - parts = name.split ('.') - if len (parts) > 1: - exec 'import ' + parts[0] # might fail - func = eval (name) - if inspect.isbuiltin (func) or type(func) is type: - doc = func.__doc__ - if doc.find (' ->') != -1: - print '_emacs_out', doc.split (' ->')[0] - else: - print '_emacs_out', doc.split ('\n')[0] - return - if inspect.ismethod (func): - func = func.im_func - if not inspect.isfunction (func): - print '_emacs_out ' - return - (args, varargs, varkw, defaults) = inspect.getargspec (func) - # No space between name and arglist for consistency with builtins. - print '_emacs_out', \ - func.__name__ + inspect.formatargspec (args, varargs, varkw, - defaults) - except: - print "_emacs_out " - -def all_names (object): - """Return (an approximation to) a list of all possible attribute - names reachable via the attributes of OBJECT, i.e. roughly the - leaves of the dictionary tree under it.""" - - def do_object (object, names): - if inspect.ismodule (object): - do_module (object, names) - elif inspect.isclass (object): - do_class (object, names) - # Might have an object without its class in scope. - elif hasattr (object, '__class__'): - names.add ('__class__') - do_class (object.__class__, names) - # Probably not a good idea to try to enumerate arbitrary - # dictionaries... - return names - - def do_module (module, names): - if hasattr (module, '__all__'): # limited export list - names.union_update (module.__all__) - for i in module.__all__: - do_object (getattr (module, i), names) - else: # use all names - names.union_update (dir (module)) - for i in dir (module): - do_object (getattr (module, i), names) - return names - - def do_class (object, names): - ns = dir (object) - names.union_update (ns) - if hasattr (object, '__bases__'): # superclasses - for i in object.__bases__: do_object (i, names) - return names - - return do_object (object, Set ([])) - -def complete (name, imports): - """Complete TEXT in NAMESPACE and print a Lisp list of completions. - Exec IMPORTS first.""" - import __main__, keyword - - def class_members(object): - names = dir (object) - if hasattr (object, '__bases__'): - for super in object.__bases__: - names = class_members (super) - return names - - names = Set ([]) - base = None - try: - dict = __main__.__dict__.copy() - if imports: exec imports in dict - l = len (name) - if not "." in name: - for list in [dir (__builtins__), keyword.kwlist, dict.keys()]: - for elt in list: - if elt[:l] == name: names.add(elt) - else: - base = name[:name.rfind ('.')] - name = name[name.rfind('.')+1:] - try: - object = eval (base, dict) - names = Set (dir (object)) - if hasattr (object, '__class__'): - names.add('__class__') - names.union_update (class_members (object)) - except: names = all_names (dict) - except: return [] - l = len(name) - print '_emacs_out (', - for n in names: - if name == n[:l]: - if base: print '"%s.%s"' % (base, n), - else: print '"%s"' % n, - print ')' - -def ehelp (name, imports): - """Get help on string NAME. - First try to eval name for, e.g. user definitions where we need - the object. Otherwise try the string form.""" - locls = {} - if imports: - try: exec imports in locls - except: pass - try: help (eval (name, globals(), locls)) - except: help (name) - -def eimport (mod, dir): - """Import module MOD with directory DIR at the head of the search path. - NB doesn't load from DIR if MOD shadows a system module.""" - from __main__ import __dict__ - - path0 = sys.path[0] - sys.path[0] = dir - try: - try: - if __dict__.has_key(mod) and inspect.ismodule (__dict__[mod]): - reload (__dict__[mod]) - else: - __dict__[mod] = __import__ (mod) - except: - (type, value, tb) = sys.exc_info () - print "Traceback (most recent call last):" - traceback.print_exception (type, value, tb.tb_next) - finally: - sys.path[0] = path0 - -def modpath (module): - """Return the source file for the given MODULE (or None). -Assumes that MODULE.py and MODULE.pyc are in the same directory.""" - try: - path = __import__ (module).__file__ - if path[-4:] == '.pyc' and os.path.exists (path[0:-1]): - path = path[:-1] - print "_emacs_out", path - except: - print "_emacs_out ()" - -# print '_emacs_ok' # ready for input and can call continuation - -# arch-tag: d90408f3-90e2-4de4-99c2-6eb9c7b9ca46 diff -r 591a9ac5b183 -r d823156fd547 lisp/ChangeLog --- a/lisp/ChangeLog Fri Apr 27 19:34:22 2007 +0000 +++ b/lisp/ChangeLog Sat Apr 28 03:47:01 2007 +0000 @@ -22,6 +22,10 @@ * version.el (emacs-version): Increase to 22.1.50. +2007-04-25 Richard Stallman + + * hi-lock.el (hi-lock-file-patterns-policy): Default to `ask'. + 2007-04-25 J.D. Smith * progmodes/idlwave.el (idlwave-beginning-of-subprogram) diff -r 591a9ac5b183 -r d823156fd547 lisp/hi-lock.el --- a/lisp/hi-lock.el Fri Apr 27 19:34:22 2007 +0000 +++ b/lisp/hi-lock.el Sat Apr 28 03:47:01 2007 +0000 @@ -124,7 +124,7 @@ :type '(repeat symbol) :group 'hi-lock) -(defcustom hi-lock-file-patterns-policy 'never +(defcustom hi-lock-file-patterns-policy 'ask "Specify when hi-lock should use patterns found in file. If `ask', prompt when patterns found in buffer; if bound to a function, use patterns when function returns t (function is called with patterns diff -r 591a9ac5b183 -r d823156fd547 lisp/ldefs-boot.el --- a/lisp/ldefs-boot.el Fri Apr 27 19:34:22 2007 +0000 +++ b/lisp/ldefs-boot.el Sat Apr 28 03:47:01 2007 +0000 @@ -1129,8 +1129,8 @@ ;;;*** -;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17956 -;;;;;; 9517)) +;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (17960 +;;;;;; 49045)) ;;; Generated autoloads from arc-mode.el (autoload (quote archive-mode) "arc-mode" "\ @@ -1795,7 +1795,7 @@ ;;;*** ;;;### (autoloads (bibtex-mode) "bibtex" "textmodes/bibtex.el" (17956 -;;;;;; 9518)) +;;;;;; 21270)) ;;; Generated autoloads from textmodes/bibtex.el (autoload (quote bibtex-mode) "bibtex" "\ @@ -2582,8 +2582,8 @@ ;;;*** ;;;### (autoloads (insert-text-button make-text-button insert-button -;;;;;; make-button define-button-type) "button" "button.el" (17935 -;;;;;; 59428)) +;;;;;; make-button define-button-type) "button" "button.el" (17964 +;;;;;; 48350)) ;;; Generated autoloads from button.el (defvar button-map (let ((map (make-sparse-keymap))) (define-key map " " (quote push-button)) (define-key map [mouse-2] (quote push-button)) map) "\ @@ -2777,7 +2777,7 @@ ;;;*** -;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17916 10823)) +;;;### (autoloads nil "cal-dst" "calendar/cal-dst.el" (17956 13479)) ;;; Generated autoloads from calendar/cal-dst.el (put (quote calendar-daylight-savings-starts) (quote risky-local-variable) t) @@ -2787,7 +2787,7 @@ ;;;*** ;;;### (autoloads (list-yahrzeit-dates) "cal-hebrew" "calendar/cal-hebrew.el" -;;;;;; (17842 53792)) +;;;;;; (17956 13479)) ;;; Generated autoloads from calendar/cal-hebrew.el (autoload (quote list-yahrzeit-dates) "cal-hebrew" "\ @@ -2802,7 +2802,7 @@ ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle ;;;;;; calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc ;;;;;; full-calc calc calc-dispatch calc-settings-file) "calc" "calc/calc.el" -;;;;;; (17955 4296)) +;;;;;; (17965 11665)) ;;; Generated autoloads from calc/calc.el (defvar calc-settings-file (convert-standard-filename "~/.calc.el") "\ @@ -2909,7 +2909,7 @@ ;;;;;; mark-holidays-in-calendar view-calendar-holidays-initially ;;;;;; calendar-remove-frame-by-deleting mark-diary-entries-in-calendar ;;;;;; view-diary-entries-initially calendar-offset) "calendar" -;;;;;; "calendar/calendar.el" (17944 20140)) +;;;;;; "calendar/calendar.el" (17956 13479)) ;;; Generated autoloads from calendar/calendar.el (defvar calendar-offset 0 "\ @@ -3519,7 +3519,7 @@ ;;;### (autoloads (pike-mode idl-mode java-mode objc-mode c++-mode ;;;;;; c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el" -;;;;;; (17926 45410)) +;;;;;; (17962 52849)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload (quote c-initialize-cc-mode) "cc-mode" "\ @@ -6020,10 +6020,10 @@ (custom-autoload (quote global-cwarn-mode) "cwarn" nil) (autoload (quote global-cwarn-mode) "cwarn" "\ -Toggle Cwarn mode in every buffer. +Toggle Cwarn mode in every possible buffer. With prefix ARG, turn Global-Cwarn mode on if and only if ARG is positive. -Cwarn mode is actually not turned on in every buffer but only in those -in which `turn-on-cwarn-mode-if-enabled' turns it on. +Cwarn mode is enabled in all buffers where `turn-on-cwarn-mode-if-enabled' would do it. +See `cwarn-mode' for more information on Cwarn mode. \(fn &optional ARG)" t nil) @@ -6736,7 +6736,7 @@ ;;;*** ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" -;;;;;; "calendar/diary-lib.el" (17944 20140)) +;;;;;; "calendar/diary-lib.el" (17958 11887)) ;;; Generated autoloads from calendar/diary-lib.el (autoload (quote diary) "diary-lib" "\ @@ -6848,7 +6848,7 @@ ;;;;;; dired dired-copy-preserve-time dired-dwim-target dired-keep-marker-symlink ;;;;;; dired-keep-marker-hardlink dired-keep-marker-copy dired-keep-marker-rename ;;;;;; dired-trivial-filenames dired-ls-F-marks-symlinks dired-listing-switches) -;;;;;; "dired" "dired.el" (17851 56703)) +;;;;;; "dired" "dired.el" (17963 25980)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches "-al" "\ @@ -7468,7 +7468,7 @@ ;;;*** ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el" -;;;;;; (17942 63381)) +;;;;;; (17962 27565)) ;;; Generated autoloads from dired-x.el (autoload (quote dired-jump) "dired-x" "\ @@ -7768,7 +7768,7 @@ ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap ;;;;;; define-globalized-minor-mode define-minor-mode) "easy-mmode" -;;;;;; "emacs-lisp/easy-mmode.el" (17860 50628)) +;;;;;; "emacs-lisp/easy-mmode.el" (17964 48351)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias (quote easy-mmode-define-minor-mode) (quote define-minor-mode)) @@ -10905,7 +10905,7 @@ ;;;*** -;;;### (autoloads nil "fill" "textmodes/fill.el" (17852 19718)) +;;;### (autoloads nil "fill" "textmodes/fill.el" (17961 33560)) ;;; Generated autoloads from textmodes/fill.el (put 'colon-double-space 'safe-local-variable 'booleanp) @@ -11327,7 +11327,7 @@ ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode) -;;;;;; "flyspell" "textmodes/flyspell.el" (17942 63381)) +;;;;;; "flyspell" "textmodes/flyspell.el" (17962 52849)) ;;; Generated autoloads from textmodes/flyspell.el (autoload (quote flyspell-prog-mode) "flyspell" "\ @@ -12008,7 +12008,7 @@ ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (17938 29201)) +;;;;;; (17960 49045)) ;;; Generated autoloads from gnus/gnus-art.el (autoload (quote gnus-article-prepare-display) "gnus-art" "\ @@ -13341,7 +13341,7 @@ ;;;### (autoloads (hi-lock-write-interactive-patterns hi-lock-unface-buffer ;;;;;; hi-lock-face-phrase-buffer hi-lock-face-buffer hi-lock-line-face-buffer ;;;;;; global-hi-lock-mode hi-lock-mode) "hi-lock" "hi-lock.el" -;;;;;; (17860 50601)) +;;;;;; (17964 48351)) ;;; Generated autoloads from hi-lock.el (autoload (quote hi-lock-mode) "hi-lock" "\ @@ -13369,17 +13369,22 @@ Remove highlighting on matches of REGEXP in current buffer. \\[hi-lock-write-interactive-patterns] - Write active REGEXPs into buffer as comments (if possible). They will + Write active REGEXPs into buffer as comments (if possible). They may be read the next time file is loaded or when the \\[hi-lock-find-patterns] command is issued. The inserted regexps are in the form of font lock keywords. - (See `font-lock-keywords'.) They may be edited and re-loaded with \\[hi-lock-find-patterns], - any valid `font-lock-keywords' form is acceptable. + (See `font-lock-keywords'.) They may be edited and re-loaded with \\[hi-lock-find-patterns], + any valid `font-lock-keywords' form is acceptable. When a file is + loaded the patterns are read if `hi-lock-file-patterns-policy is + 'ask and the user responds y to the prompt, or if + `hi-lock-file-patterns-policy' is bound to a function and that + function returns t. \\[hi-lock-find-patterns] Re-read patterns stored in buffer (in the format produced by \\[hi-lock-write-interactive-patterns]). -When hi-lock is started and if the mode is not excluded, the -beginning of the buffer is searched for lines of the form: +When hi-lock is started and if the mode is not excluded or patterns +rejected, the beginning of the buffer is searched for lines of the +form: Hi-lock: FOO where FOO is a list of patterns. These are added to the font lock keywords already present. The patterns must start before position @@ -13400,10 +13405,10 @@ (custom-autoload (quote global-hi-lock-mode) "hi-lock" nil) (autoload (quote global-hi-lock-mode) "hi-lock" "\ -Toggle Hi-Lock mode in every buffer. +Toggle Hi-Lock mode in every possible buffer. With prefix ARG, turn Global-Hi-Lock mode on if and only if ARG is positive. -Hi-Lock mode is actually not turned on in every buffer but only in those -in which `turn-on-hi-lock-if-enabled' turns it on. +Hi-Lock mode is enabled in all buffers where `turn-on-hi-lock-if-enabled' would do it. +See `hi-lock-mode' for more information on Hi-Lock mode. \(fn &optional ARG)" t nil) @@ -13828,7 +13833,7 @@ ;;;*** ;;;### (autoloads (list-holidays holidays) "holidays" "calendar/holidays.el" -;;;;;; (17842 53792)) +;;;;;; (17956 13479)) ;;; Generated autoloads from calendar/holidays.el (autoload (quote holidays) "holidays" "\ @@ -14508,7 +14513,7 @@ ;;;*** ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el" -;;;;;; (17935 59227)) +;;;;;; (17965 23638)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload (quote idlwave-shell) "idlw-shell" "\ @@ -14669,8 +14674,8 @@ ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17932 -;;;;;; 16456)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (17963 +;;;;;; 25911)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -15137,6 +15142,145 @@ ;;;*** +;;;### (autoloads (image-dired-dired-edit-comment-and-tags image-dired-mark-tagged-files +;;;;;; image-dired-dired-comment-files image-dired-dired-display-image +;;;;;; image-dired-dired-display-external image-dired-display-thumb +;;;;;; image-dired-display-thumbs-append image-dired-setup-dired-keybindings +;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag +;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs +;;;;;; image-dired-dired-with-window-configuration image-dired-dired-insert-marked-thumbs) +;;;;;; "image-dired" "image-dired.el" (17963 26200)) +;;; Generated autoloads from image-dired.el + +(autoload (quote image-dired-dired-insert-marked-thumbs) "image-dired" "\ +Insert thumbnails before file names of marked files in the dired buffer. + +\(fn)" t nil) + +(autoload (quote image-dired-dired-with-window-configuration) "image-dired" "\ +Open directory DIR and create a default window configuration. + +Convenience command that: + + - Opens dired in folder DIR + - Splits windows in most useful (?) way + - Set `truncate-lines' to t + +After the command has finished, you would typically mark some +image files in dired and type +\\[image-dired-display-thumbs] (`image-dired-display-thumbs'). + +If called with prefix argument ARG, skip splitting of windows. + +The current window configuration is saved and can be restored by +calling `image-dired-restore-window-configuration'. + +\(fn DIR &optional ARG)" t nil) + +(autoload (quote image-dired-display-thumbs) "image-dired" "\ +Display thumbnails of all marked files, in `image-dired-thumbnail-buffer'. +If a thumbnail image does not exist for a file, it is created on the +fly. With prefix argument ARG, display only thumbnail for file at +point (this is useful if you have marked some files but want to show +another one). + +Recommended usage is to split the current frame horizontally so that +you have the dired buffer in the left window and the +`image-dired-thumbnail-buffer' buffer in the right window. + +With optional argument APPEND, append thumbnail to thumbnail buffer +instead of erasing it first. + +Option argument DO-NOT-POP controls if `pop-to-buffer' should be +used or not. If non-nil, use `display-buffer' instead of +`pop-to-buffer'. This is used from functions like +`image-dired-next-line-and-display' and +`image-dired-previous-line-and-display' where we do not want the +thumbnail buffer to be selected. + +\(fn &optional ARG APPEND DO-NOT-POP)" t nil) + +(autoload (quote image-dired-show-all-from-dir) "image-dired" "\ +Make a preview buffer for all images in DIR and display it. +If the number of files in DIR matching `image-file-name-regexp' +exceeds `image-dired-show-all-from-dir-max-files', a warning will be +displayed. + +\(fn DIR)" t nil) + +(defalias (quote image-dired) (quote image-dired-show-all-from-dir)) + +(defalias (quote tumme) (quote image-dired-show-all-from-dir)) + +(autoload (quote image-dired-tag-files) "image-dired" "\ +Tag marked file(s) in dired. With prefix ARG, tag file at point. + +\(fn ARG)" t nil) + +(autoload (quote image-dired-delete-tag) "image-dired" "\ +Remove tag for selected file(s). +With prefix argument ARG, remove tag from file at point. + +\(fn ARG)" t nil) + +(autoload (quote image-dired-jump-thumbnail-buffer) "image-dired" "\ +Jump to thumbnail buffer. + +\(fn)" t nil) + +(autoload (quote image-dired-setup-dired-keybindings) "image-dired" "\ +Setup easy-to-use keybindings for the commands to be used in dired mode. +Note that n, p and and will be hijacked and bound to +`image-dired-dired-x-line'. + +\(fn)" t nil) + +(autoload (quote image-dired-display-thumbs-append) "image-dired" "\ +Append thumbnails to `image-dired-thumbnail-buffer'. + +\(fn)" t nil) + +(autoload (quote image-dired-display-thumb) "image-dired" "\ +Shorthand for `image-dired-display-thumbs' with prefix argument. + +\(fn)" t nil) + +(autoload (quote image-dired-dired-display-external) "image-dired" "\ +Display file at point using an external viewer. + +\(fn)" t nil) + +(autoload (quote image-dired-dired-display-image) "image-dired" "\ +Display current image file. +See documentation for `image-dired-display-image' for more information. +With prefix argument ARG, display image in its original size. + +\(fn &optional ARG)" t nil) + +(autoload (quote image-dired-dired-comment-files) "image-dired" "\ +Add comment to current or marked files in dired. + +\(fn)" t nil) + +(autoload (quote image-dired-mark-tagged-files) "image-dired" "\ +Use regexp to mark files with matching tag. +A `tag' is a keyword, a piece of meta data, associated with an +image file and stored in image-dired's database file. This command +lets you input a regexp and this will be matched against all tags +on all image files in the database file. The files that have a +matching tags will be marked in the dired buffer. + +\(fn)" t nil) + +(autoload (quote image-dired-dired-edit-comment-and-tags) "image-dired" "\ +Edit comment and tags of current or marked image files. +Edit comment and tags for all marked image files in an +easy-to-use form. + +\(fn)" t nil) + +;;;*** + ;;;### (autoloads (auto-image-file-mode insert-image-file image-file-name-regexp ;;;;;; image-file-name-regexps image-file-name-extensions) "image-file" ;;;;;; "image-file.el" (17842 58279)) @@ -15464,7 +15608,7 @@ ;;;### (autoloads (Info-speedbar-browser Info-goto-emacs-key-command-node ;;;;;; Info-goto-emacs-command-node Info-mode info-apropos Info-index ;;;;;; Info-directory Info-on-current-buffer info-standalone info-emacs-manual -;;;;;; info info-other-window) "info" "info.el" (17936 34375)) +;;;;;; info info-other-window) "info" "info.el" (17964 52883)) ;;; Generated autoloads from info.el (autoload (quote info-other-window) "info" "\ @@ -16791,7 +16935,7 @@ ;;;*** ;;;### (autoloads (locate-with-filter locate locate-ls-subdir-switches) -;;;;;; "locate" "locate.el" (17842 58279)) +;;;;;; "locate" "locate.el" (17965 12050)) ;;; Generated autoloads from locate.el (defvar locate-ls-subdir-switches "-al" "\ @@ -16819,7 +16963,9 @@ The main use of FILTER is to implement `locate-with-filter'. See the docstring of that function for its meaning. -\(fn SEARCH-STRING &optional FILTER)" t nil) +ARG is the interactive prefix arg. + +\(fn SEARCH-STRING &optional FILTER ARG)" t nil) (autoload (quote locate-with-filter) "locate" "\ Run the executable program `locate' with a filter. @@ -16831,10 +16977,12 @@ contain a match for the regular expression FILTER; this is often useful to constrain a big search. +ARG is the interactive prefix arg, which has the same effect as in `locate'. + When called from Lisp, this function is identical with `locate', except that FILTER is not optional. -\(fn SEARCH-STRING FILTER)" t nil) +\(fn SEARCH-STRING FILTER &optional ARG)" t nil) ;;;*** @@ -16998,8 +17146,8 @@ ;;;*** -;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17916 -;;;;;; 10998)) +;;;### (autoloads (phases-of-moon) "lunar" "calendar/lunar.el" (17956 +;;;;;; 13479)) ;;; Generated autoloads from calendar/lunar.el (autoload (quote phases-of-moon) "lunar" "\ @@ -19697,7 +19845,7 @@ ;;;*** -;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17842 58279)) +;;;### (autoloads (show-paren-mode) "paren" "paren.el" (17960 50513)) ;;; Generated autoloads from paren.el (defvar show-paren-mode nil "\ @@ -19722,7 +19870,7 @@ ;;;*** ;;;### (autoloads (parse-time-string) "parse-time" "calendar/parse-time.el" -;;;;;; (17842 53792)) +;;;;;; (17957 43164)) ;;; Generated autoloads from calendar/parse-time.el (autoload (quote parse-time-string) "parse-time" "\ @@ -20150,7 +20298,7 @@ ;;;*** ;;;### (autoloads (perl-mode) "perl-mode" "progmodes/perl-mode.el" -;;;;;; (17955 36604)) +;;;;;; (17962 28280)) ;;; Generated autoloads from progmodes/perl-mode.el (autoload (quote perl-mode) "perl-mode" "\ @@ -21506,81 +21654,6 @@ ;;;*** -;;;### (autoloads (jython-mode python-mode run-python) "python" "progmodes/python.el" -;;;;;; (17956 9518)) -;;; Generated autoloads from progmodes/python.el - -(add-to-list (quote interpreter-mode-alist) (quote ("jython" . jython-mode))) - -(add-to-list (quote interpreter-mode-alist) (quote ("python" . python-mode))) - -(add-to-list (quote auto-mode-alist) (quote ("\\.py\\'" . python-mode))) - -(autoload (quote run-python) "python" "\ -Run an inferior Python process, input and output via buffer *Python*. -CMD is the Python command to run. NOSHOW non-nil means don't show the -buffer automatically. - -Normally, if there is a process already running in `python-buffer', -switch to that buffer. Interactively, a prefix arg allows you to edit -the initial command line (default is `python-command'); `-i' etc. args -will be added to this as appropriate. A new process is started if: -one isn't running attached to `python-buffer', or interactively the -default `python-command', or argument NEW is non-nil. See also the -documentation for `python-buffer'. - -Runs the hook `inferior-python-mode-hook' (after the -`comint-mode-hook' is run). (Type \\[describe-mode] in the process -buffer for a list of commands.) - -\(fn &optional CMD NOSHOW NEW)" t nil) - -(autoload (quote python-mode) "python" "\ -Major mode for editing Python files. -Font Lock mode is currently required for correct parsing of the source. -See also `jython-mode', which is actually invoked if the buffer appears to -contain Jython code. See also `run-python' and associated Python mode -commands for running Python under Emacs. - -The Emacs commands which work with `defun's, e.g. \\[beginning-of-defun], deal -with nested `def' and `class' blocks. They take the innermost one as -current without distinguishing method and class definitions. Used multiple -times, they move over others at the same indentation level until they reach -the end of definitions at that level, when they move up a level. -\\ -Colon is electric: it outdents the line if appropriate, e.g. for -an else statement. \\[python-backspace] at the beginning of an indented statement -deletes a level of indentation to close the current block; otherwise it -deletes a character backward. TAB indents the current line relative to -the preceding code. Successive TABs, with no intervening command, cycle -through the possibilities for indentation on the basis of enclosing blocks. - -\\[fill-paragraph] fills comments and multi-line strings appropriately, but has no -effect outside them. - -Supports Eldoc mode (only for functions, using a Python process), -Info-Look and Imenu. In Outline minor mode, `class' and `def' -lines count as headers. Symbol completion is available in the -same way as in the Python shell using the `rlcompleter' module -and this is added to the Hippie Expand functions locally if -Hippie Expand mode is turned on. Completion of symbols of the -form x.y only works if the components are literal -module/attribute names, not variables. An abbrev table is set up -with skeleton expansions for compound statement templates. - -\\{python-mode-map} - -\(fn)" t nil) - -(autoload (quote jython-mode) "python" "\ -Major mode for editing Jython files. -Like `python-mode', but sets up parameters for Jython subprocesses. -Runs `jython-mode-hook' after `python-mode-hook'. - -\(fn)" t nil) - -;;;*** - ;;;### (autoloads (quoted-printable-decode-region) "qp" "gnus/qp.el" ;;;;;; (17842 54741)) ;;; Generated autoloads from gnus/qp.el @@ -24197,7 +24270,7 @@ ;;;*** -;;;### (autoloads nil "simple" "simple.el" (17949 41467)) +;;;### (autoloads nil "simple" "simple.el" (17965 11665)) ;;; Generated autoloads from simple.el (put 'fill-prefix 'safe-local-variable 'string-or-null-p) @@ -24470,7 +24543,7 @@ ;;;### (autoloads (solar-equinoxes-solstices sunrise-sunset calendar-location-name ;;;;;; calendar-longitude calendar-latitude calendar-time-display-form) -;;;;;; "solar" "calendar/solar.el" (17916 11038)) +;;;;;; "solar" "calendar/solar.el" (17956 13479)) ;;; Generated autoloads from calendar/solar.el (defvar calendar-time-display-form (quote (12-hours ":" minutes am-pm (if time-zone " (") time-zone (if time-zone ")"))) "\ @@ -25460,7 +25533,7 @@ ;;;*** -;;;### (autoloads (locate-library) "subr" "subr.el" (17949 41467)) +;;;### (autoloads (locate-library) "subr" "subr.el" (17964 48351)) ;;; Generated autoloads from subr.el (autoload (quote locate-library) "subr" "\ @@ -25514,7 +25587,7 @@ ;;;*** -;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17938 61442)) +;;;### (autoloads (t-mouse-mode) "t-mouse" "t-mouse.el" (17963 25911)) ;;; Generated autoloads from t-mouse.el (defvar t-mouse-mode nil "\ @@ -26909,7 +26982,7 @@ ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked ;;;;;; thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el" -;;;;;; (17842 58278)) +;;;;;; (17963 26308)) ;;; Generated autoloads from thumbs.el (autoload (quote thumbs-find-thumb) "thumbs" "\ @@ -27493,7 +27566,7 @@ ;;;### (autoloads (todo-show todo-cp todo-mode todo-print todo-top-priorities ;;;;;; todo-insert-item todo-add-item-non-interactively todo-add-category) -;;;;;; "todo-mode" "calendar/todo-mode.el" (17842 53792)) +;;;;;; "todo-mode" "calendar/todo-mode.el" (17962 52848)) ;;; Generated autoloads from calendar/todo-mode.el (autoload (quote todo-add-category) "todo-mode" "\ @@ -27846,142 +27919,6 @@ ;;;*** -;;;### (autoloads (tumme-dired-edit-comment-and-tags tumme-mark-tagged-files -;;;;;; tumme-dired-comment-files tumme-dired-display-image tumme-dired-display-external -;;;;;; tumme-display-thumb tumme-display-thumbs-append tumme-setup-dired-keybindings -;;;;;; tumme-jump-thumbnail-buffer tumme-delete-tag tumme-tag-files -;;;;;; tumme-show-all-from-dir tumme-display-thumbs tumme-dired-with-window-configuration -;;;;;; tumme-dired-insert-marked-thumbs) "tumme" "tumme.el" (17842 -;;;;;; 58278)) -;;; Generated autoloads from tumme.el - -(autoload (quote tumme-dired-insert-marked-thumbs) "tumme" "\ -Insert thumbnails before file names of marked files in the dired buffer. - -\(fn)" t nil) - -(autoload (quote tumme-dired-with-window-configuration) "tumme" "\ -Open directory DIR and create a default window configuration. - -Convenience command that: - - - Opens dired in folder DIR - - Splits windows in most useful (?) way - - Set `truncate-lines' to t - -After the command has finished, you would typically mark some -image files in dired and type -\\[tumme-display-thumbs] (`tumme-display-thumbs'). - -If called with prefix argument ARG, skip splitting of windows. - -The current window configuration is saved and can be restored by -calling `tumme-restore-window-configuration'. - -\(fn DIR &optional ARG)" t nil) - -(autoload (quote tumme-display-thumbs) "tumme" "\ -Display thumbnails of all marked files, in `tumme-thumbnail-buffer'. -If a thumbnail image does not exist for a file, it is created on the -fly. With prefix argument ARG, display only thumbnail for file at -point (this is useful if you have marked some files but want to show -another one). - -Recommended usage is to split the current frame horizontally so that -you have the dired buffer in the left window and the -`tumme-thumbnail-buffer' buffer in the right window. - -With optional argument APPEND, append thumbnail to thumbnail buffer -instead of erasing it first. - -Option argument DO-NOT-POP controls if `pop-to-buffer' should be -used or not. If non-nil, use `display-buffer' instead of -`pop-to-buffer'. This is used from functions like -`tumme-next-line-and-display' and -`tumme-previous-line-and-display' where we do not want the -thumbnail buffer to be selected. - -\(fn &optional ARG APPEND DO-NOT-POP)" t nil) - -(autoload (quote tumme-show-all-from-dir) "tumme" "\ -Make a preview buffer for all images in DIR and display it. -If the number of files in DIR matching `image-file-name-regexp' -exceeds `tumme-show-all-from-dir-max-files', a warning will be -displayed. - -\(fn DIR)" t nil) - -(defalias (quote tumme) (quote tumme-show-all-from-dir)) - -(autoload (quote tumme-tag-files) "tumme" "\ -Tag marked file(s) in dired. With prefix ARG, tag file at point. - -\(fn ARG)" t nil) - -(autoload (quote tumme-delete-tag) "tumme" "\ -Remove tag for selected file(s). -With prefix argument ARG, remove tag from file at point. - -\(fn ARG)" t nil) - -(autoload (quote tumme-jump-thumbnail-buffer) "tumme" "\ -Jump to thumbnail buffer. - -\(fn)" t nil) - -(autoload (quote tumme-setup-dired-keybindings) "tumme" "\ -Setup easy-to-use keybindings for the commands to be used in dired mode. -Note that n, p and and will be hijacked and bound to -`tumme-dired-x-line'. - -\(fn)" t nil) - -(autoload (quote tumme-display-thumbs-append) "tumme" "\ -Append thumbnails to `tumme-thumbnail-buffer'. - -\(fn)" t nil) - -(autoload (quote tumme-display-thumb) "tumme" "\ -Shorthand for `tumme-display-thumbs' with prefix argument. - -\(fn)" t nil) - -(autoload (quote tumme-dired-display-external) "tumme" "\ -Display file at point using an external viewer. - -\(fn)" t nil) - -(autoload (quote tumme-dired-display-image) "tumme" "\ -Display current image file. -See documentation for `tumme-display-image' for more information. -With prefix argument ARG, display image in its original size. - -\(fn &optional ARG)" t nil) - -(autoload (quote tumme-dired-comment-files) "tumme" "\ -Add comment to current or marked files in dired. - -\(fn)" t nil) - -(autoload (quote tumme-mark-tagged-files) "tumme" "\ -Use regexp to mark files with matching tag. -A `tag' is a keyword, a piece of meta data, associated with an -image file and stored in tumme's database file. This command -lets you input a regexp and this will be matched against all tags -on all image files in the database file. The files that have a -matching tags will be marked in the dired buffer. - -\(fn)" t nil) - -(autoload (quote tumme-dired-edit-comment-and-tags) "tumme" "\ -Edit comment and tags of current or marked image files. -Edit comment and tags for all marked image files in an -easy-to-use form. - -\(fn)" t nil) - -;;;*** - ;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (17892 ;;;;;; 62683)) ;;; Generated autoloads from tutorial.el @@ -29317,7 +29254,7 @@ ;;;*** ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el" -;;;;;; (17854 10062)) +;;;;;; (17962 27361)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload (quote vhdl-mode) "vhdl-mode" "\ @@ -30980,7 +30917,7 @@ ;;;;;; "url/url-vars.el" "url/vc-dav.el" "vc-hooks.el" "vcursor.el" ;;;;;; "version.el" "vms-patch.el" "vmsproc.el" "vt-control.el" ;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "widget.el" "window.el" -;;;;;; "x-dnd.el") (17956 9728 35408)) +;;;;;; "x-dnd.el") (17965 26976 559735)) ;;;*** diff -r 591a9ac5b183 -r d823156fd547 lispref/ChangeLog --- a/lispref/ChangeLog Fri Apr 27 19:34:22 2007 +0000 +++ b/lispref/ChangeLog Sat Apr 28 03:47:01 2007 +0000 @@ -7,6 +7,12 @@ * elisp.texi: Improve line breaks on copyright page, similar layout to emacs manual, 8.5x11 by default. +2007-04-24 Richard Stallman + + * text.texi (Special Properties): Add xref to Overlay Properties. + + * display.texi (Overlay Properties): Add xref to Special Properties. + 2007-04-22 Richard Stallman * keymaps.texi (Extended Menu Items): Move the info about diff -r 591a9ac5b183 -r d823156fd547 lispref/display.texi --- a/lispref/display.texi Fri Apr 27 19:34:22 2007 +0000 +++ b/lispref/display.texi Sat Apr 28 03:47:01 2007 +0000 @@ -1418,6 +1418,9 @@ @code{inhibit-modification-hooks} to @code{t} around doing so, to avoid confusing the internal mechanism that calls these hooks. +Text properties also support the @code{modification-hooks} property, +but the details are somewhat different (@pxref{Special Properties}). + @item insert-in-front-hooks @kindex insert-in-front-hooks @r{(overlay property)} This property's value is a list of functions to be called before and diff -r 591a9ac5b183 -r d823156fd547 lispref/text.texi --- a/lispref/text.texi Fri Apr 27 19:34:22 2007 +0000 +++ b/lispref/text.texi Sat Apr 28 03:47:01 2007 +0000 @@ -3195,6 +3195,9 @@ @code{inhibit-modification-hooks} to @code{t} around doing so, to avoid confusing the internal mechanism that calls these hooks. +Overlays also support the @code{modification-hooks} property, but the +details are somewhat different (@pxref{Overlay Properties}). + @item insert-in-front-hooks @itemx insert-behind-hooks @kindex insert-in-front-hooks @r{(text property)} diff -r 591a9ac5b183 -r d823156fd547 man/ack.texi --- a/man/ack.texi Fri Apr 27 19:34:22 2007 +0000 +++ b/man/ack.texi Sat Apr 28 03:47:01 2007 +0000 @@ -683,8 +683,6 @@ characters on Latin-1 terminals by setting up appropriate display tables, @item -@file{python.el}, a major mode for the Python programming language. -@item @file{refill.el}, a mode for automatic paragraph refilling, akin to typical word processors, @item diff -r 591a9ac5b183 -r d823156fd547 man/anti.texi --- a/man/anti.texi Fri Apr 27 19:34:22 2007 +0000 +++ b/man/anti.texi Sat Apr 28 03:47:01 2007 +0000 @@ -278,8 +278,8 @@ @item The Calc, CUA, Ibuffer, Ido, Password, Printing, Reveal, Ruler-mode, SES, Table, Tramp, and URL packages have been removed. -The Benchmark, Cfengine, Conf, Dns, Flymake, Python, Thumbs, and -Wdired modes have also been removed. +The Benchmark, Cfengine, Conf, Dns, Flymake, Thumbs, and Wdired modes +have also been removed. @item The Emacs Lisp Reference Manual and the Introduction to Programming in diff -r 591a9ac5b183 -r d823156fd547 man/faq.texi --- a/man/faq.texi Fri Apr 27 19:34:22 2007 +0000 +++ b/man/faq.texi Sat Apr 28 03:47:01 2007 +0000 @@ -1213,7 +1213,7 @@ Many new modes and packages have been included in Emacs, such as Calc, TRAMP, URL, IDO, CUA, ERC, rcirc, Table, Image-Dired, SES, Ruler, Org, PGG, Flymake, Password, Printing, Reveal, wdired, t-mouse, longlines, -savehist, Conf mode, Python mode, DNS mode, etc. +savehist, Conf mode, DNS mode, etc. @cindex Multilingual Environment @item diff -r 591a9ac5b183 -r d823156fd547 man/programs.texi --- a/man/programs.texi Fri Apr 27 19:34:22 2007 +0000 +++ b/man/programs.texi Sat Apr 28 03:47:01 2007 +0000 @@ -76,7 +76,6 @@ @cindex Metafont mode @cindex Modula2 mode @cindex Prolog mode -@cindex Python mode @cindex Simula mode @cindex VHDL mode @cindex M4 mode @@ -90,7 +89,7 @@ ASM, AWK, C, C++, Delphi (Object Pascal), Fortran (free format and fixed format), Icon, IDL (CORBA), IDLWAVE, Java, Metafont (@TeX{}'s companion for font creation), Modula2, Objective-C, Octave, Pascal, -Perl, Pike, PostScript, Prolog, Python, Simula, Tcl, and VHDL. An +Perl, Pike, PostScript, Prolog, Simula, Tcl, and VHDL. An alternative mode for Perl is called CPerl mode. Modes are available for the scripting languages of the common GNU and Unix shells, VMS DCL, and MS-DOS/MS-Windows @samp{BAT} files. There are also major modes for