From edf4fa7f8d95c2ebd9aca6c4bb2e7cb13fa7a59e Mon Sep 17 00:00:00 2001 From: Vinicius Jose Latorre Date: Wed, 30 Jan 2008 11:44:31 +0000 Subject: [PATCH 01/12] Eliminate blank-mode package. This package is only in trunk. --- lisp/ChangeLog | 64 -- lisp/blank-mode.el | 1694 -------------------------------------------- 2 files changed, 1758 deletions(-) delete mode 100644 lisp/blank-mode.el diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aa5b50b2208..c512c3cd91c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -64,34 +64,10 @@ that the filename end is found even when the filename is empty. Fixes error and spurious newlines when marking files for deletion. -2008-01-26 Vinicius Jose Latorre - - * blank-mode.el: New version 9.1. Handle "long" line tail - visualization. Doc fix. - (blank-line-length): Renamed to blank-line-column. - (blank-chars-value-list, blank-toggle-option-alist, blank-help-text): - Initialization fix. - (blank-replace-spaces-by-tabs): New fun. - (blank-cleanup, blank-cleanup-region, blank-color-on): Code fix. - 2008-01-25 Juanma Barranquero * allout.el (allout-unload-function): New function. -2008-01-25 Vinicius Jose Latorre - - * blank-mode.el: New version 9.0. New commands to clean up some blank - problems like trailing blanks. New faces and regexp for visualizing - the blank problems. Doc fix. - (blank-chars, blank-global-modes, blank-chars-value-list) - (blank-toggle-option-alist, blank-help-text): Initialization fix. - (blank-indentation, blank-empty, blank-space-after-tab): New faces. - (blank-indentation, blank-empty, blank-space-after-tab) - (blank-indentation-regexp, blank-empty-at-bob-regexp) - (blank-empty-at-eob-regexp, blank-space-after-tab-regexp): New options. - (blank-cleanup, blank-cleanup-region): New commands. - (blank-color-on): Code fix. - 2008-01-25 Sven Joachim * view.el (kill-buffer-if-not-modified): Don't pass t to @@ -119,24 +95,6 @@ * lpr.el (printer-name): Do not set on MS Windows. -2008-01-21 Vinicius Jose Latorre - - * blank-mode.el: Fix a problem of cleaning blank faces when turning off - blank-mode in some buffers (like *info* buffers). Reported by Juanma - Barranquero . Eliminate `-face' suffix of all - blank-mode faces. Doc fix. New version 8.1. - (blank-turn-on, blank-turn-off): Replace (and CONDITION BODY) by (when - CONDITION BODY). - (blank-space-face): Face/option name replaced by blank-space. - (blank-hspace-face): Face/option name replaced by blank-hspace. - (blank-tab-face): Face/option name replaced by blank-tab. - (blank-newline-face): Face/option name replaced by blank-newline. - (blank-trailing-face): Face/option name replaced by blank-trailing. - (blank-line-face): Face/option name replaced by blank-line. - (blank-space-before-tab-face): Face/option name replaced by - blank-space-before-tab. - (blank-color-on, blank-color-off, blank-display-char-on): Fix code. - 2008-01-20 Glenn Morris * progmodes/python.el: Quote all calls to "auxiliary skeleton"s to @@ -152,33 +110,11 @@ * progmodes/cc-vars.el (c-syntactic-indentation) (c-syntactic-indentation-in-macros): Mark as safe. -2008-01-19 Juanma Barranquero - - * blank-mode.el (blank-style, blank-chars, blank-hspace-regexp) - (blank-space-regexp, blank-tab-regexp, blank-trailing-regexp) - (blank-space-before-tab-regexp, blank-global-modes, blank-mode) - (global-blank-mode): Doc fixes. - (blank, blank-space-face, blank-hspace-face, blank-tab-face) - (blank-newline-face, blank-trailing-face, blank-line-face) - (blank-space-before-tab-face, blank-display-mappings) - (blank-chars-value-list, blank-style-value-list, blank-toggle-options) - (global-blank-toggle-options, blank-help-text, blank-interactive-char) - (blank-turn-on, blank-turn-off, blank-color-on, blank-color-off): - Fix typos in docstrings. - 2008-01-18 Richard Stallman * icomplete.el (icomplete-get-keys): Look up KEYS using all maps in proper buffer. -2008-01-17 Vinicius Jose Latorre - Miles Bader - - * blank-mode.el: New file. Minor mode to visualise TAB, - (HARD) SPACE, NEWLINE. Miles Bader wrote the original - code for handling display table (via visws.el package), his code was - modified, but the main idea was kept. - 2008-01-16 Alan Mackenzie * progmodes/cc-vars.el (c-constant-symbol): Put this defun inside diff --git a/lisp/blank-mode.el b/lisp/blank-mode.el deleted file mode 100644 index 5f1270c49a7..00000000000 --- a/lisp/blank-mode.el +++ /dev/null @@ -1,1694 +0,0 @@ -;;; blank-mode.el --- minor mode to visualize TAB, (HARD) SPACE, NEWLINE - -;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -;; Free Software Foundation, Inc. - -;; Author: Vinicius Jose Latorre -;; Maintainer: Vinicius Jose Latorre -;; Keywords: data, wp -;; Version: 9.1 -;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre - -;; 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 3, 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. - -;;; Commentary: - -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; -;; Introduction -;; ------------ -;; -;; This package is a minor mode to visualize blanks (TAB, (HARD) SPACE -;; and NEWLINE). -;; -;; blank-mode uses two ways to visualize blanks: faces and display -;; table. -;; -;; * Faces are used to highlight the background with a color. -;; blank-mode uses font-lock to highlight blank characters. -;; -;; * Display table changes the way a character is displayed, that is, -;; it provides a visual mark for characters, for example, at the end -;; of line (?\xB6), at SPACEs (?\xB7) and at TABs (?\xBB). -;; -;; The `blank-style' and `blank-chars' variables are used to select -;; which way should be used to visualize blanks. -;; -;; Note that when blank-mode is turned on, blank-mode saves the -;; font-lock state, that is, if font-lock is on or off. And -;; blank-mode restores the font-lock state when it is turned off. So, -;; if blank-mode is turned on and font-lock is off, blank-mode also -;; turns on the font-lock to highlight blanks, but the font-lock will -;; be turned off when blank-mode is turned off. Thus, turn on -;; font-lock before blank-mode is on, if you want that font-lock -;; continues on after blank-mode is turned off. -;; -;; When blank-mode is on, it takes care of highlighting some special -;; characters over the default mechanism of `nobreak-char-display' -;; (which see) and `show-trailing-whitespace' (which see). -;; -;; There are two ways of using blank-mode: local and global. -;; -;; * Local blank-mode affects only the current buffer. -;; -;; * Global blank-mode affects all current and future buffers. That -;; is, if you turn on global blank-mode and then create a new -;; buffer, the new buffer will also have blank-mode on. The -;; `blank-global-modes' variable controls which major-mode will be -;; automagically turned on. -;; -;; You can mix the local and global usage without any conflict. But -;; local blank-mode has priority over global blank-mode. Blank mode -;; is active in a buffer if you have enabled it in that buffer or if -;; you have enabled it globally. -;; -;; When global and local blank-mode are on: -;; -;; * if local blank-mode is turned off, blank-mode is turned off for -;; the current buffer only. -;; -;; * if global blank-mode is turned off, blank-mode continues on only -;; in the buffers in which local blank-mode is on. -;; -;; To use blank-mode, insert in your ~/.emacs: -;; -;; (require 'blank-mode) -;; -;; Or autoload at least one of the commands`blank-mode', -;; `blank-toggle-options', `global-blank-mode' or -;; `global-blank-toggle-options'. For example: -;; -;; (autoload 'blank-mode "blank-mode" -;; "Toggle blank visualization." t) -;; (autoload 'blank-toggle-options "blank-mode" -;; "Toggle local `blank-mode' options." t) -;; -;; blank-mode was inspired by: -;; -;; whitespace.el Rajesh Vaidheeswarran -;; Warn about and clean bogus whitespaces in the file -;; (inspired the idea to warn and clean some blanks) -;; -;; show-whitespace-mode.el Aurelien Tisne -;; Simple mode to highlight whitespaces -;; (inspired the idea to use font-lock) -;; -;; whitespace-mode.el Lawrence Mitchell -;; Major mode for editing Whitespace -;; (inspired the idea to use display table) -;; -;; visws.el Miles Bader -;; Make whitespace visible -;; (handle display table, his code was modified, but the main -;; idea was kept) -;; -;; -;; Using blank-mode -;; ---------------- -;; -;; There is no problem if you mix local and global minor mode usage. -;; -;; * LOCAL blank-mode: -;; + To toggle blank-mode options locally, type: -;; -;; M-x blank-toggle-options RET -;; -;; + To activate blank-mode locally, type: -;; -;; C-u 1 M-x blank-mode RET -;; -;; + To deactivate blank-mode locally, type: -;; -;; C-u 0 M-x blank-mode RET -;; -;; + To toggle blank-mode locally, type: -;; -;; M-x blank-mode RET -;; -;; * GLOBAL blank-mode: -;; + To toggle blank-mode options globally, type: -;; -;; M-x global-blank-toggle-options RET -;; -;; + To activate blank-mode globally, type: -;; -;; C-u 1 M-x global-blank-mode RET -;; -;; + To deactivate blank-mode globally, type: -;; -;; C-u 0 M-x global-blank-mode RET -;; -;; + To toggle blank-mode globally, type: -;; -;; M-x global-blank-mode RET -;; -;; There are also the following useful commands: -;; -;; `blank-cleanup' -;; Cleanup some blank problems in all buffer or at region. -;; -;; `blank-cleanup-region' -;; Cleanup some blank problems at region. -;; -;; The problems, which are cleaned up, are: -;; -;; 1. empty lines at beginning of buffer. -;; 2. empty lines at end of buffer. -;; If `blank-chars' has `empty' as an element, remove all empty -;; lines at beginning and/or end of buffer. -;; -;; 3. 8 or more SPACEs at beginning of line. -;; If `blank-chars' has `indentation' as an element, replace 8 or -;; more SPACEs at beginning of line by TABs. -;; -;; 4. SPACEs before TAB. -;; If `blank-chars' has `space-before-tab' as an element, replace -;; SPACEs by TABs. -;; -;; 5. SPACEs or TABs at end of line. -;; If `blank-chars' has `trailing' as an element, remove all -;; SPACEs or TABs at end of line." -;; -;; 6. 8 or more SPACEs after TAB. -;; If `blank-chars' has `space-after-tab' as an element, replace -;; SPACEs by TABs. -;; -;; -;; Hooks -;; ----- -;; -;; blank-mode has the following hook variables: -;; -;; `blank-mode-hook' -;; It is evaluated always when blank-mode is turned on locally. -;; -;; `global-blank-mode-hook' -;; It is evaluated always when blank-mode is turned on globally. -;; -;; `blank-load-hook' -;; It is evaluated after blank-mode package is loaded. -;; -;; -;; Options -;; ------- -;; -;; Below it's shown a brief description of blank-mode options, please, -;; see the options declaration in the code for a long documentation. -;; -;; `blank-style' Specify the visualization style. -;; -;; `blank-chars' Specify which kind of blank is -;; visualized. -;; -;; `blank-space' Face used to visualize SPACE. -;; -;; `blank-hspace' Face used to visualize HARD SPACE. -;; -;; `blank-tab' Face used to visualize TAB. -;; -;; `blank-newline' Face used to visualize NEWLINE char -;; mapping. -;; -;; `blank-trailing' Face used to visualize trailing -;; blanks. -;; -;; `blank-line' Face used to visualize "long" lines. -;; -;; `blank-space-before-tab' Face used to visualize SPACEs before -;; TAB. -;; -;; `blank-indentation' Face used to visualize 8 or more -;; SPACEs at beginning of line. -;; -;; `blank-empty' Face used to visualize empty lines at -;; beginning and/or end of buffer. -;; -;; `blank-space-after-tab' Face used to visualize 8 or more -;; SPACEs after TAB. -;; -;; `blank-space-regexp' Specify SPACE characters regexp. -;; -;; `blank-hspace-regexp' Specify HARD SPACE characters regexp. -;; -;; `blank-tab-regexp' Specify TAB characters regexp. -;; -;; `blank-trailing-regexp' Specify trailing characters regexp. -;; -;; `blank-space-before-tab-regexp' Specify SPACEs before TAB -;; regexp. -;; -;; `blank-indentation-regexp' Specify regexp for 8 or more SPACEs at -;; beginning of line. -;; -;; `blank-empty-at-bob-regexp' Specify regexp for empty lines at -;; beginning of buffer. -;; -;; `blank-empty-at-eob-regexp' Specify regexp for empty lines at end -;; of buffer. -;; -;; `blank-space-after-tab-regexp' Specify regexp for 8 or more -;; SPACEs after TAB. -;; -;; `blank-line-column' Specify column beyond which the line -;; is highlighted. -;; -;; `blank-display-mappings' Specify an alist of mappings for -;; displaying characters. -;; -;; `blank-global-modes' Modes for which global `blank-mode' is -;; automagically turned on. -;; -;; -;; Acknowledgements -;; ---------------- -;; -;; Thanks to nschum (EmacsWiki) for the idea about highlight "long" -;; lines tail. See EightyColumnRule (EmacsWiki). -;; -;; Thanks to Juri Linkov for suggesting: -;; * `define-minor-mode'. -;; * `global-blank-*' name for global commands. -;; -;; Thanks to Robert J. Chassell for doc fix and testing. -;; -;; Thanks to Drew Adams for toggle commands -;; suggestion. -;; -;; Thanks to Antti Kaihola for -;; helping to fix `find-file-hooks' reference. -;; -;; Thanks to Andreas Roehler for -;; indicating defface byte-compilation warnings. -;; -;; Thanks to TimOCallaghan (EmacsWiki) for the idea about highlight -;; "long" lines. See EightyColumnRule (EmacsWiki). -;; -;; Thanks to Yanghui Bian for indicating a new -;; newline character mapping. -;; -;; Thanks to Pete Forman for indicating -;; whitespace-mode on XEmacs. -;; -;; Thanks to Miles Bader for handling display table via -;; visws.el (his code was modified, but the main idea was kept). -;; -;; Thanks to: -;; Rajesh Vaidheeswarran whitespace.el -;; Aurelien Tisne show-whitespace-mode.el -;; Lawrence Mitchell whitespace-mode.el -;; Miles Bader visws.el -;; And to all people who contributed with them. -;; -;; -;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - -;;; code: - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;; User Variables: - - -;;; Interface to the command system - - -(defgroup blank nil - "Visualize blanks (TAB, (HARD) SPACE and NEWLINE)." - :link '(emacs-library-link :tag "Source Lisp File" "blank-mode.el") - :version "22.2" - :group 'wp - :group 'data) - - -(defcustom blank-style '(mark color) - "*Specify the visualization style. - -It's a list which element value can be: - - mark display mappings are visualized. - - color faces are visualized. - -Any other value is ignored. - -If nil, don't visualize TABs, (HARD) SPACEs and NEWLINEs. - -See also `blank-display-mappings' for documentation." - :type '(repeat :tag "Style of Blank" - (choice :tag "Style of Blank" - (const :tag "Display Table" mark) - (const :tag "Faces" color))) - :group 'blank) - - -(defcustom blank-chars - '(tabs spaces trailing lines space-before-tab newline - indentation empty space-after-tab) - "*Specify which kind of blank is visualized. - -It's a list which element value can be: - - trailing trailing blanks are visualized. - - tabs TABs are visualized. - - spaces SPACEs and HARD SPACEs are visualized. - - lines lines whose have columns beyond - `blank-line-column' are highlighted. - Whole line is highlighted. - It has precedence over - `lines-tail' (see below). - - lines-tail lines whose have columns beyond - `blank-line-column' are highlighted. - But only the part of line which goes - beyond `blank-line-column' column. - It has effect only if `lines' (see above) - is not present in `blank-chars'. - - space-before-tab SPACEs before TAB are visualized. - - newline NEWLINEs are visualized. - - indentation 8 or more SPACEs at beginning of line are - visualized. - - empty empty lines at beginning and/or end of buffer - are visualized. - - space-after-tab 8 or more SPACEs after a TAB are visualized. - -Any other value is ignored. - -If nil, don't visualize TABs, (HARD) SPACEs and NEWLINEs. - -Used when `blank-style' has `color' as an element. -If `blank-chars' has `newline' as an element, used when `blank-style' -has `mark' as an element." - :type '(repeat :tag "Kind of Blank" - (choice :tag "Kind of Blank" - (const :tag "Trailing TABs, SPACEs and HARD SPACEs" - trailing) - (const :tag "SPACEs and HARD SPACEs" spaces) - (const :tag "TABs" tabs) - (const :tag "Lines" lines) - (const :tag "SPACEs before TAB" - space-before-tab) - (const :tag "NEWLINEs" newline) - (const :tag "Indentation SPACEs" indentation) - (const :tag "Empty Lines At BOB And/Or EOB" - empty) - (const :tag "SPACEs after TAB" - space-after-tab))) - :group 'blank) - - -(defcustom blank-space 'blank-space - "*Symbol face used to visualize SPACE. - -Used when `blank-style' has `color' as an element." - :type 'face - :group 'blank) - - -(defface blank-space - '((((class color) (background dark)) - (:background "grey20" :foreground "aquamarine3")) - (((class color) (background light)) - (:background "LightYellow" :foreground "aquamarine3")) - (t (:inverse-video t))) - "Face used to visualize SPACE." - :group 'blank) - - -(defcustom blank-hspace 'blank-hspace - "*Symbol face used to visualize HARD SPACE. - -Used when `blank-style' has `color' as an element." - :type 'face - :group 'blank) - - -(defface blank-hspace ; 'nobreak-space - '((((class color) (background dark)) - (:background "grey24" :foreground "aquamarine3")) - (((class color) (background light)) - (:background "LemonChiffon3" :foreground "aquamarine3")) - (t (:inverse-video t))) - "Face used to visualize HARD SPACE." - :group 'blank) - - -(defcustom blank-tab 'blank-tab - "*Symbol face used to visualize TAB. - -Used when `blank-style' has `color' as an element." - :type 'face - :group 'blank) - - -(defface blank-tab - '((((class color) (background dark)) - (:background "grey22" :foreground "aquamarine3")) - (((class color) (background light)) - (:background "beige" :foreground "aquamarine3")) - (t (:inverse-video t))) - "Face used to visualize TAB." - :group 'blank) - - -(defcustom blank-newline 'blank-newline - "*Symbol face used to visualize NEWLINE char mapping. - -See `blank-display-mappings'. - -Used when `blank-style' has `mark' and `color' as elements -and `blank-chars' has `newline' as an element." - :type 'face - :group 'blank) - - -(defface blank-newline - '((((class color) (background dark)) - (:background "grey26" :foreground "aquamarine3" :bold t)) - (((class color) (background light)) - (:background "linen" :foreground "aquamarine3" :bold t)) - (t (:bold t :underline t))) - "Face used to visualize NEWLINE char mapping. - -See `blank-display-mappings'." - :group 'blank) - - -(defcustom blank-trailing 'blank-trailing - "*Symbol face used to visualize traling blanks. - -Used when `blank-style' has `color' as an element." - :type 'face - :group 'blank) - - -(defface blank-trailing ; 'trailing-whitespace - '((((class mono)) (:inverse-video t :bold t :underline t)) - (t (:background "red1" :foreground "yellow" :bold t))) - "Face used to visualize trailing blanks." - :group 'blank) - - -(defcustom blank-line 'blank-line - "*Symbol face used to visualize \"long\" lines. - -See `blank-line-column'. - -Used when `blank-style' has `color' as an element." - :type 'face - :group 'blank) - - -(defface blank-line - '((((class mono)) (:inverse-video t :bold t :underline t)) - (t (:background "gray20" :foreground "violet"))) - "Face used to visualize \"long\" lines. - -See `blank-line-column'." - :group 'blank) - - -(defcustom blank-space-before-tab 'blank-space-before-tab - "*Symbol face used to visualize SPACEs before TAB. - -Used when `blank-style' has `color' as an element." - :type 'face - :group 'blank) - - -(defface blank-space-before-tab - '((((class mono)) (:inverse-video t :bold t :underline t)) - (t (:background "DarkOrange" :foreground "firebrick"))) - "Face used to visualize SPACEs before TAB." - :group 'blank) - - -(defcustom blank-indentation 'blank-indentation - "*Symbol face used to visualize 8 or more SPACEs at beginning of line. - -Used when `blank-style' has `color' as an element." - :type 'face - :group 'blank) - - -(defface blank-indentation - '((((class mono)) (:inverse-video t :bold t :underline t)) - (t (:background "yellow" :foreground "firebrick"))) - "Face used to visualize 8 or more SPACEs at beginning of line." - :group 'blank) - - -(defcustom blank-empty 'blank-empty - "*Symbol face used to visualize empty lines at beginning and/or end of buffer. - -Used when `blank-style' has `color' as an element." - :type 'face - :group 'blank) - - -(defface blank-empty - '((((class mono)) (:inverse-video t :bold t :underline t)) - (t (:background "yellow" :foreground "firebrick"))) - "Face used to visualize empty lines at beginning and/or end of buffer." - :group 'blank) - - -(defcustom blank-space-after-tab 'blank-space-after-tab - "*Symbol face used to visualize 8 or more SPACEs after TAB. - -Used when `blank-style' has `color' as an element." - :type 'face - :group 'blank) - - -(defface blank-space-after-tab - '((((class mono)) (:inverse-video t :bold t :underline t)) - (t (:background "yellow" :foreground "firebrick"))) - "Face used to visualize 8 or more SPACEs after TAB." - :group 'blank) - - -(defcustom blank-hspace-regexp - "\\(\\(\xA0\\|\x8A0\\|\x920\\|\xE20\\|\xF20\\)+\\)" - "*Specify HARD SPACE characters regexp. - -If you're using `mule' package, it may exist other characters besides: - - \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \"\\xF20\" - -that should be considered HARD SPACE. - -Here are some examples: - - \"\\\\(^\\xA0+\\\\)\" \ -visualize only leading HARD SPACEs. - \"\\\\(\\xA0+$\\\\)\" \ -visualize only trailing HARD SPACEs. - \"\\\\(^\\xA0+\\\\|\\xA0+$\\\\)\" \ -visualize leading and/or trailing HARD SPACEs. - \"\\t\\\\(\\xA0+\\\\)\\t\" \ -visualize only HARD SPACEs between TABs. - -NOTE: Enclose always by \\\\( and \\\\) the elements to highlight. - Use exactly one pair of enclosing \\\\( and \\\\). - -Used when `blank-style' has `color' as an element, and -`blank-chars' has `spaces' as an element." - :type '(regexp :tag "HARD SPACE Chars") - :group 'blank) - - -(defcustom blank-space-regexp "\\( +\\)" - "*Specify SPACE characters regexp. - -If you're using `mule' package, it may exist other characters -besides \" \" that should be considered SPACE. - -Here are some examples: - - \"\\\\(^ +\\\\)\" visualize only leading SPACEs. - \"\\\\( +$\\\\)\" visualize only trailing SPACEs. - \"\\\\(^ +\\\\| +$\\\\)\" \ -visualize leading and/or trailing SPACEs. - \"\\t\\\\( +\\\\)\\t\" visualize only SPACEs between TABs. - -NOTE: Enclose always by \\\\( and \\\\) the elements to highlight. - Use exactly one pair of enclosing \\\\( and \\\\). - -Used when `blank-style' has `color' as an element, and -`blank-chars' has `spaces' as an element." - :type '(regexp :tag "SPACE Chars") - :group 'blank) - - -(defcustom blank-tab-regexp "\\(\t+\\)" - "*Specify TAB characters regexp. - -If you're using `mule' package, it may exist other characters -besides \"\\t\" that should be considered TAB. - -Here are some examples: - - \"\\\\(^\\t+\\\\)\" visualize only leading TABs. - \"\\\\(\\t+$\\\\)\" visualize only trailing TABs. - \"\\\\(^\\t+\\\\|\\t+$\\\\)\" \ -visualize leading and/or trailing TABs. - \" \\\\(\\t+\\\\) \" visualize only TABs between SPACEs. - -NOTE: Enclose always by \\\\( and \\\\) the elements to highlight. - Use exactly one pair of enclosing \\\\( and \\\\). - -Used when `blank-style' has `color' as an element, and -`blank-chars' has `tabs' as an element." - :type '(regexp :tag "TAB Chars") - :group 'blank) - - -(defcustom blank-trailing-regexp - "\t\\| \\|\xA0\\|\x8A0\\|\x920\\|\xE20\\|\xF20" - "*Specify trailing characters regexp. - -If you're using `mule' package, it may exist other characters besides: - - \" \" \"\\t\" \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \ -\"\\xF20\" - -that should be considered blank. - -NOTE: DO NOT enclose by \\\\( and \\\\) the elements to highlight. - `blank-mode' surrounds this regexp by \"\\\\(\\\\(\" and - \"\\\\)+\\\\)$\". - -Used when `blank-style' has `color' as an element, and -`blank-chars' has `trailing' as an element." - :type '(regexp :tag "Trailing Chars") - :group 'blank) - - -(defcustom blank-space-before-tab-regexp "\\( +\\)\t" - "*Specify SPACEs before TAB regexp. - -If you're using `mule' package, it may exist other characters besides: - - \" \" \"\\t\" \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \ -\"\\xF20\" - -that should be considered blank. - -Used when `blank-style' has `color' as an element, and -`blank-chars' has `space-before-tab' as an element." - :type '(regexp :tag "SPACEs Before TAB") - :group 'blank) - - -(defcustom blank-indentation-regexp "^\t*\\(\\( \\{8\\}\\)+\\)[^\n\t]" - "*Specify regexp for 8 or more SPACEs at beginning of line. - -If you're using `mule' package, it may exist other characters besides: - - \" \" \"\\t\" \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \ -\"\\xF20\" - -that should be considered blank. - -Used when `blank-style' has `color' as an element, and -`blank-chars' has `indentation' as an element." - :type '(regexp :tag "Indentation SPACEs") - :group 'blank) - - -(defcustom blank-empty-at-bob-regexp "\\`\\(\\([ \t]*\n\\)+\\)" - "*Specify regexp for empty lines at beginning of buffer. - -If you're using `mule' package, it may exist other characters besides: - - \" \" \"\\t\" \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \ -\"\\xF20\" - -that should be considered blank. - -Used when `blank-style' has `color' as an element, and -`blank-chars' has `empty' as an element." - :type '(regexp :tag "Empty Lines At Beginning Of Buffer") - :group 'blank) - - -(defcustom blank-empty-at-eob-regexp "^\\([ \t\n]+\\)\\'" - "*Specify regexp for empty lines at end of buffer. - -If you're using `mule' package, it may exist other characters besides: - - \" \" \"\\t\" \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \ -\"\\xF20\" - -that should be considered blank. - -Used when `blank-style' has `color' as an element, and -`blank-chars' has `empty' as an element." - :type '(regexp :tag "Empty Lines At End Of Buffer") - :group 'blank) - - -(defcustom blank-space-after-tab-regexp "\t\\(\\( \\{8\\}\\)+\\)" - "*Specify regexp for 8 or more SPACEs after TAB. - -If you're using `mule' package, it may exist other characters besides: - - \" \" \"\\t\" \"\\xA0\" \"\\x8A0\" \"\\x920\" \"\\xE20\" \ -\"\\xF20\" - -that should be considered blank. - -Used when `blank-style' has `color' as an element, and -`blank-chars' has `space-after-tab' as an element." - :type '(regexp :tag "SPACEs After TAB") - :group 'blank) - - -(defcustom blank-line-column 80 - "*Specify column beyond which the line is highlighted. - -Used when `blank-style' has `color' as an element, and -`blank-chars' has `lines' or `lines-tail' as an element." - :type '(integer :tag "Line Length") - :group 'blank) - - -;; Hacked from `visible-whitespace-mappings' in visws.el -(defcustom blank-display-mappings - ;; Due to limitations of glyph representation, the char code can not - ;; be above ?\x1FFFF. Probably, this will be fixed after Emacs - ;; unicode merging. - '( - (?\ [?\xB7] [?.]) ; space - centered dot - (?\xA0 [?\xA4] [?_]) ; hard space - currency - (?\x8A0 [?\x8A4] [?_]) ; hard space - currency - (?\x920 [?\x924] [?_]) ; hard space - currency - (?\xE20 [?\xE24] [?_]) ; hard space - currency - (?\xF20 [?\xF24] [?_]) ; hard space - currency - ;; NEWLINE is displayed using the face `blank-newline' - (?\n [?$ ?\n]) ; end-of-line - dollar sign - ;; (?\n [?\u21B5 ?\n] [?$ ?\n]) ; end-of-line - downwards arrow - ;; (?\n [?\xB6 ?\n] [?$ ?\n]) ; end-of-line - pilcrow - ;; (?\n [?\x8AF ?\n] [?$ ?\n]) ; end-of-line - overscore - ;; (?\n [?\x8AC ?\n] [?$ ?\n]) ; end-of-line - negation - ;; (?\n [?\x8B0 ?\n] [?$ ?\n]) ; end-of-line - grade - ;; - ;; WARNING: the mapping below has a problem. - ;; When a TAB occupies exactly one column, it will display the - ;; character ?\xBB at that column followed by a TAB which goes to - ;; the next TAB column. - ;; If this is a problem for you, please, comment the line below. - (?\t [?\xBB ?\t] [?\\ ?\t]) ; tab - left quote mark - ) - "*Specify an alist of mappings for displaying characters. - -Each element has the following form: - - (CHAR VECTOR...) - -Where: - -CHAR is the character to be mapped. - -VECTOR is a vector of characters to be displayed in place of CHAR. - The first display vector that can be displayed is used; - if no display vector for a mapping can be displayed, then - that character is displayed unmodified. - -The NEWLINE character is displayed using the face given by -`blank-newline' variable. The characters in the vector to be -displayed will not have this face applied if the character code -is above #x1FFFF. - -Used when `blank-style' has `mark' as an element." - :type '(repeat - (list :tag "Character Mapping" - (character :tag "Char") - (repeat :inline t :tag "Vector List" - (vector :tag "" - (repeat :inline t - :tag "Vector Characters" - (character :tag "Char")))))) - :group 'blank) - - -(defcustom blank-global-modes t - "*Modes for which global `blank-mode' is automagically turned on. - -Global `blank-mode' is controlled by the command `global-blank-mode'. - -If nil, means no modes have `blank-mode' automatically turned on. -If t, all modes that support `blank-mode' have it automatically -turned on. -Else it should be a list of `major-mode' symbol names for -which `blank-mode' should be automatically turned on. The sense -of the list is negated if it begins with `not'. For example: - - (c-mode c++-mode) - -means that `blank-mode' is turned on for buffers in C and C++ -modes only." - :type '(choice (const :tag "None" nil) - (const :tag "All" t) - (set :menu-tag "Mode Specific" :tag "Modes" - :value (not) - (const :tag "Except" not) - (repeat :inline t - (symbol :tag "Mode")))) - :group 'blank) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;; User commands - Local mode - - -;;;###autoload -(define-minor-mode blank-mode - "Toggle blank minor mode visualization (\"bl\" on modeline). - -If ARG is null, toggle blank visualization. -If ARG is a number greater than zero, turn on visualization; -otherwise, turn off visualization. -Only useful with a windowing system." - :lighter " bl" - :init-value nil - :global nil - :group 'blank - (cond - (noninteractive ; running a batch job - (setq blank-mode nil)) - (blank-mode ; blank-mode on - (blank-turn-on)) - (t ; blank-mode off - (blank-turn-off)))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;; User commands - Global mode - - -(define-minor-mode global-blank-mode - "Toggle blank global minor mode visualization (\"BL\" on modeline). - -If ARG is null, toggle blank visualization. -If ARG is a number greater than zero, turn on visualization; -otherwise, turn off visualization. -Only useful with a windowing system." - :lighter " BL" - :init-value nil - :global t - :group 'blank - (cond - (noninteractive ; running a batch job - (setq global-blank-mode nil)) - (global-blank-mode ; global-blank-mode on - (save-excursion - (if (boundp 'find-file-hook) - (add-hook 'find-file-hook 'blank-turn-on-if-enabled t) - (add-hook 'find-file-hooks 'blank-turn-on-if-enabled t)) - (dolist (buffer (buffer-list)) ; adjust all local mode - (set-buffer buffer) - (unless blank-mode - (blank-turn-on-if-enabled))))) - (t ; global-blank-mode off - (save-excursion - (if (boundp 'find-file-hook) - (remove-hook 'find-file-hook 'blank-turn-on-if-enabled) - (remove-hook 'find-file-hooks 'blank-turn-on-if-enabled)) - (dolist (buffer (buffer-list)) ; adjust all local mode - (set-buffer buffer) - (unless blank-mode - (blank-turn-off))))))) - - -(defun blank-turn-on-if-enabled () - (when (cond - ((eq blank-global-modes t)) - ((listp blank-global-modes) - (if (eq (car-safe blank-global-modes) 'not) - (not (memq major-mode (cdr blank-global-modes))) - (memq major-mode blank-global-modes))) - (t nil)) - (let (inhibit-quit) - ;; Don't turn on blank mode if... - (or - ;; ...we don't have a display (we're running a batch job) - noninteractive - ;; ...or if the buffer is invisible (name starts with a space) - (eq (aref (buffer-name) 0) ?\ ) - ;; ...or if the buffer is temporary (name starts with *) - (and (eq (aref (buffer-name) 0) ?*) - ;; except the scratch buffer. - (not (string= (buffer-name) "*scratch*"))) - ;; Otherwise, turn on blank mode. - (blank-turn-on))))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;; User commands - Toggle - - -(defconst blank-chars-value-list - '(tabs - spaces - trailing - space-before-tab - lines - lines-tail - newline - indentation - empty - space-after-tab - ) - "List of valid `blank-chars' values.") - - -(defconst blank-style-value-list - '(color - mark - ) - "List of valid `blank-style' values.") - - -(defconst blank-toggle-option-alist - '((?t . tabs) - (?s . spaces) - (?r . trailing) - (?b . space-before-tab) - (?l . lines) - (?L . lines-tail) - (?n . newline) - (?i . indentation) - (?e . empty) - (?a . space-after-tab) - (?c . color) - (?m . mark) - (?x . blank-chars) - (?z . blank-style) - ) - "Alist of toggle options. - -Each element has the form: - - (CHAR . SYMBOL) - -Where: - -CHAR is a char which the user will have to type. - -SYMBOL is a valid symbol associated with CHAR. - See `blank-chars-value-list' and `blank-style-value-list'.") - - -(defvar blank-active-chars nil - "Used to save locally `blank-chars' value.") -(make-variable-buffer-local 'blank-active-chars) - -(defvar blank-active-style nil - "Used to save locally `blank-style' value.") -(make-variable-buffer-local 'blank-active-style) - - -;;;###autoload -(defun blank-toggle-options (arg) - "Toggle local `blank-mode' options. - -If local blank-mode is off, toggle the option given by ARG and -turn on local blank-mode. - -If local blank-mode is on, toggle the option given by ARG and -restart local blank-mode. - -Interactively, it reads one of the following chars: - - CHAR MEANING - t toggle TAB visualization - s toggle SPACE and HARD SPACE visualization - r toggle trailing blanks visualization - b toggle SPACEs before TAB visualization - l toggle \"long lines\" visualization - L toggle \"long lines\" tail visualization - n toggle NEWLINE visualization - i toggle indentation SPACEs visualization - e toggle empty line at bob and/or eob visualization - a toggle SPACEs after TAB visualization - c toggle color faces - m toggle visual mark - x restore `blank-chars' value - z restore `blank-style' value - ? display brief help - -Non-interactively, ARG should be a symbol or a list of symbols. -The valid symbols are: - - tabs toggle TAB visualization - spaces toggle SPACE and HARD SPACE visualization - trailing toggle trailing blanks visualization - space-before-tab toggle SPACEs before TAB visualization - lines toggle \"long lines\" visualization - lines-tail toggle \"long lines\" tail visualization - newline toggle NEWLINE visualization - indentation toggle indentation SPACEs visualization - empty toggle empty line at bob and/or eob visualization - space-after-tab toggle SPACEs after TAB visualization - color toggle color faces - mark toggle visual mark - blank-chars restore `blank-chars' value - blank-style restore `blank-style' value - -Only useful with a windowing system." - (interactive (blank-interactive-char t)) - (let ((blank-chars - (blank-toggle-list t arg blank-active-chars blank-chars - 'blank-chars blank-chars-value-list)) - (blank-style - (blank-toggle-list t arg blank-active-style blank-style - 'blank-style blank-style-value-list))) - (blank-mode 0) - (blank-mode 1))) - - -(defvar blank-toggle-chars nil - "Used to toggle the global `blank-chars' value.") -(defvar blank-toggle-style nil - "Used to toggle the global `blank-style' value.") - - -;;;###autoload -(defun global-blank-toggle-options (arg) - "Toggle global `blank-mode' options. - -If global blank-mode is off, toggle the option given by ARG and -turn on global blank-mode. - -If global blank-mode is on, toggle the option given by ARG and -restart global blank-mode. - -Interactively, it reads one of the following chars: - - CHAR MEANING - t toggle TAB visualization - s toggle SPACE and HARD SPACE visualization - r toggle trailing blanks visualization - b toggle SPACEs before TAB visualization - l toggle \"long lines\" visualization - L toggle \"long lines\" tail visualization - n toggle NEWLINE visualization - i toggle indentation SPACEs visualization - e toggle empty line at bob and/or eob visualization - a toggle SPACEs after TAB visualization - c toggle color faces - m toggle visual mark - x restore `blank-chars' value - z restore `blank-style' value - ? display brief help - -Non-interactively, ARG should be a symbol or a list of symbols. -The valid symbols are: - - tabs toggle TAB visualization - spaces toggle SPACE and HARD SPACE visualization - trailing toggle trailing blanks visualization - space-before-tab toggle SPACEs before TAB visualization - lines toggle \"long lines\" visualization - lines-tail toggle \"long lines\" tail visualization - newline toggle NEWLINE visualization - indentation toggle indentation SPACEs visualization - empty toggle empty line at bob and/or eob visualization - space-after-tab toggle SPACEs after TAB visualization - color toggle color faces - mark toggle visual mark - blank-chars restore `blank-chars' value - blank-style restore `blank-style' value - -Only useful with a windowing system." - (interactive (blank-interactive-char nil)) - (let ((blank-chars - (blank-toggle-list nil arg blank-toggle-chars blank-chars - 'blank-chars blank-chars-value-list)) - (blank-style - (blank-toggle-list nil arg blank-toggle-style blank-style - 'blank-style blank-style-value-list))) - (setq blank-toggle-chars blank-chars - blank-toggle-style blank-style) - (global-blank-mode 0) - (global-blank-mode 1))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;; User commands - Cleanup - - -;;;###autoload -(defun blank-cleanup () - "Cleanup some blank problems in all buffer or at region. - -It usually applies to the whole buffer, but in transient mark -mode when the mark is active, it applies to the region. It also -applies to the region when it is not in transiente mark mode, the -mark is active and it was pressed `C-u' just before calling -`blank-cleanup' interactively. - -See also `blank-cleanup-region'. - -The problems, which are cleaned up, are: - -1. empty lines at beginning of buffer. -2. empty lines at end of buffer. - If `blank-chars' has `empty' as an element, remove all empty - lines at beginning and/or end of buffer. - -3. 8 or more SPACEs at beginning of line. - If `blank-chars' has `indentation' as an element, replace 8 or - more SPACEs at beginning of line by TABs. - -4. SPACEs before TAB. - If `blank-chars' has `space-before-tab' as an element, replace - SPACEs by TABs. - -5. SPACEs or TABs at end of line. - If `blank-chars' has `trailing' as an element, remove all - SPACEs or TABs at end of line. - -6. 8 or more SPACEs after TAB. - If `blank-chars' has `space-after-tab' as an element, replace - SPACEs by TABs." - (interactive "@*") - (if (and (or transient-mark-mode - current-prefix-arg) - mark-active) - ;; region active - ;; problems 1 and 2 are not handled in region - ;; problem 3: 8 or more SPACEs at bol - ;; problem 4: SPACEs before TAB - ;; problem 5: SPACEs or TABs at eol - ;; problem 6: 8 or more SPACEs after TAB - (blank-cleanup-region (region-beginning) (region-end)) - ;; whole buffer - (save-excursion - (save-match-data - ;; problem 1: empty lines at bob - ;; problem 2: empty lines at eob - ;; action: remove all empty lines at bob and/or eob - (when (memq 'empty blank-chars) - (let (overwrite-mode) ; enforce no overwrite - (goto-char (point-min)) - (when (re-search-forward blank-empty-at-bob-regexp nil t) - (delete-region (match-beginning 1) (match-end 1))) - (when (re-search-forward blank-empty-at-eob-regexp nil t) - (delete-region (match-beginning 1) (match-end 1))))))) - ;; problem 3: 8 or more SPACEs at bol - ;; problem 4: SPACEs before TAB - ;; problem 5: SPACEs or TABs at eol - ;; problem 6: 8 or more SPACEs after TAB - (blank-cleanup-region (point-min) (point-max)))) - - -;;;###autoload -(defun blank-cleanup-region (start end) - "Cleanup some blank problems at region. - -The problems, which are cleaned up, are: - -1. 8 or more SPACEs at beginning of line. - If `blank-chars' has `indentation' as an element, replace 8 or - more SPACEs at beginning of line by TABs. - -2. SPACEs before TAB. - If `blank-chars' has `space-before-tab' as an element, replace - SPACEs by TABs. - -3. SPACEs or TABs at end of line. - If `blank-chars' has `trailing' as an element, remove all - SPACEs or TABs at end of line. - -4. 8 or more SPACEs after TAB. - If `blank-chars' has `space-after-tab' as an element, replace - SPACEs by TABs." - (interactive "@*r") - (let ((rstart (min start end)) - (rend (copy-marker (max start end))) - (tab-width 8) ; assure TAB width - (indent-tabs-mode t) ; always insert TABs - overwrite-mode ; enforce no overwrite - tmp) - (save-excursion - (save-match-data - ;; problem 1: 8 or more SPACEs at bol - ;; action: replace 8 or more SPACEs at bol by TABs - (when (memq 'indentation blank-chars) - (goto-char rstart) - (while (re-search-forward blank-indentation-regexp rend t) - (setq tmp (current-indentation)) - (delete-horizontal-space) - (unless (eolp) - (indent-to tmp)))) - ;; problem 3: SPACEs or TABs at eol - ;; action: remove all SPACEs or TABs at eol - (when (memq 'trailing blank-chars) - (let ((regexp (concat "\\(\\(" blank-trailing-regexp - "\\)+\\)$"))) - (goto-char rstart) - (while (re-search-forward regexp rend t) - (delete-region (match-beginning 1) (match-end 1))))) - ;; problem 4: 8 or more SPACEs after TAB - ;; action: replace 8 or more SPACEs by TABs - (when (memq 'space-after-tab blank-chars) - (blank-replace-spaces-by-tabs - rstart rend blank-space-after-tab-regexp)) - ;; problem 2: SPACEs before TAB - ;; action: replace SPACEs before TAB by TABs - (when (memq 'space-before-tab blank-chars) - (blank-replace-spaces-by-tabs - rstart rend blank-space-before-tab-regexp)))) - (set-marker rend nil))) ; point marker to nowhere - - -(defun blank-replace-spaces-by-tabs (rstart rend regexp) - "Replace all SPACEs by TABs matched by REGEXP between RSTART and REND." - (goto-char rstart) - (while (re-search-forward regexp rend t) - (goto-char (match-beginning 1)) - (let* ((scol (current-column)) - (ecol (save-excursion - (goto-char (match-end 1)) - (current-column)))) - (delete-region (match-beginning 1) (match-end 1)) - (insert-char ?\t - (/ (- (- ecol (% ecol 8)) ; prev end col - (- scol (% scol 8))) ; prev start col - 8))))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;; Internal functions - - -(defvar blank-font-lock-mode nil - "Used to remember whether a buffer had font lock mode on or not.") -(make-variable-buffer-local 'blank-font-lock-mode) - -(defvar blank-font-lock nil - "Used to remember whether a buffer initially had font lock on or not.") -(make-variable-buffer-local 'blank-font-lock) - -(defvar blank-font-lock-keywords nil - "Used to save locally `font-lock-keywords' value.") -(make-variable-buffer-local 'blank-font-lock-keywords) - - -(defconst blank-help-text - "\ - blank-mode toggle options: - - [] t - toggle TAB visualization - [] s - toggle SPACE and HARD SPACE visualization - [] r - toggle trailing blanks visualization - [] b - toggle SPACEs before TAB visualization - [] l - toggle \"long lines\" visualization - [] L - toggle \"long lines\" tail visualization - [] n - toggle NEWLINE visualization - [] i - toggle indentation SPACEs visualization - [] e - toggle empty line at bob and/or eob visualization - [] a - toggle SPACEs after TAB visualization - - [] c - toggle color faces - [] m - toggle visual mark - - x - restore `blank-chars' value - z - restore `blank-style' value - - ? - display this text\n\n" - "Text for blank toggle options.") - - -(defconst blank-help-buffer-name "*Blank Toggle Options*" - "The buffer name for blank toggle options.") - - -(defun blank-insert-option-mark (the-list the-value) - "Insert the option mark ('X' or ' ') in toggle options buffer." - (forward-line 1) - (dolist (sym the-list) - (forward-line 1) - (forward-char 2) - (insert (if (memq sym the-value) "X" " ")))) - - -(defun blank-help-on (chars style) - "Display the blank toggle options." - (unless (get-buffer blank-help-buffer-name) - (delete-other-windows) - (let ((buffer (get-buffer-create blank-help-buffer-name))) - (save-excursion - (set-buffer buffer) - (erase-buffer) - (insert blank-help-text) - (goto-char (point-min)) - (blank-insert-option-mark blank-chars-value-list chars) - (blank-insert-option-mark blank-style-value-list style) - (goto-char (point-min)) - (set-buffer-modified-p nil) - (let ((size (- (window-height) - (max window-min-height - (1+ (count-lines (point-min) (point-max))))))) - (when (<= size 0) - (kill-buffer buffer) - (error "Frame height is too small; \ -can't split window to display blank toggle options")) - (set-window-buffer (split-window nil size) buffer)))))) - - -(defun blank-help-off () - "Remove the buffer and window of the blank toggle options." - (let ((buffer (get-buffer blank-help-buffer-name))) - (when buffer - (delete-windows-on buffer) - (kill-buffer buffer)))) - - -(defun blank-interactive-char (local-p) - "Interactive function to read a char and return a symbol. - -If LOCAL-P is non-nil, it uses a local context; otherwise, it -uses a global context. - -It reads one of the following chars: - - CHAR MEANING - t toggle TAB visualization - s toggle SPACE and HARD SPACE visualization - r toggle trailing blanks visualization - b toggle SPACEs before TAB visualization - l toggle \"long lines\" visualization - L toggle \"long lines\" tail visualization - n toggle NEWLINE visualization - i toggle indentation SPACEs visualization - e toggle empty line at bob and/or eob visualization - a toggle SPACEs after TAB visualization - c toggle color faces - m toggle visual mark - x restore `blank-chars' value - z restore `blank-style' value - ? display brief help - -See also `blank-toggle-option-alist'." - (let* ((is-off (not (if local-p blank-mode global-blank-mode))) - (chars (cond (is-off blank-chars) ; use default value - (local-p blank-active-chars) - (t blank-toggle-chars))) - (style (cond (is-off blank-style) ; use default value - (local-p blank-active-style) - (t blank-toggle-style))) - (prompt - (format "Blank Toggle %s (type ? for further options)-" - (if local-p "Local" "Global"))) - ch sym) - ;; read a valid option and get the corresponding symbol - (save-window-excursion - (condition-case data - (progn - (while - ;; while condition - (progn - (setq ch (read-char prompt)) - (not - (setq sym - (cdr (assq ch blank-toggle-option-alist))))) - ;; while body - (if (eq ch ?\?) - (blank-help-on chars style) - (ding))) - (blank-help-off) - (message " ")) ; clean echo area - ;; handler - ((quit error) - (blank-help-off) - (error (error-message-string data))))) - (list sym))) ; return the apropriate symbol - - -(defun blank-toggle-list (local-p arg the-list default-list - sym-restore sym-list) - "Toggle options in THE-LIST based on list ARG. - -If LOCAL-P is non-nil, it uses a local context; otherwise, it -uses a global context. - -ARG is a list of options to be toggled. - -THE-LIST is a list of options. This list will be toggled and the -resultant list will be returned. - -DEFAULT-LIST is the default list of options. It is used to -restore the options in THE-LIST. - -SYM-RESTORE is the symbol which indicates to restore the options -in THE-LIST. - -SYM-LIST is a list of valid options, used to check if the ARG's -options are valid." - (unless (if local-p blank-mode global-blank-mode) - (setq the-list default-list)) - (setq the-list (copy-sequence the-list)) ; keep original list - (dolist (sym (if (listp arg) arg (list arg))) - (cond - ;; restore default values - ((eq sym sym-restore) - (setq the-list default-list)) - ;; toggle valid values - ((memq sym sym-list) - (setq the-list (if (memq sym the-list) - (delq sym the-list) - (cons sym the-list)))))) - the-list) - - -(defun blank-turn-on () - "Turn on blank visualization." - (setq blank-active-style (if (listp blank-style) - blank-style - (list blank-style))) - (setq blank-active-chars (if (listp blank-chars) - blank-chars - (list blank-chars))) - (when (memq 'color blank-active-style) - (blank-color-on)) - (when (memq 'mark blank-active-style) - (blank-display-char-on))) - - -(defun blank-turn-off () - "Turn off blank visualization." - (when (memq 'color blank-active-style) - (blank-color-off)) - (when (memq 'mark blank-active-style) - (blank-display-char-off))) - - -(defun blank-color-on () - "Turn on color visualization." - (when blank-active-chars - (unless blank-font-lock - (setq blank-font-lock t - blank-font-lock-keywords - (copy-sequence font-lock-keywords))) - ;; turn off font lock - (setq blank-font-lock-mode font-lock-mode) - (font-lock-mode 0) - ;; add blank-mode color into font lock - (when (memq 'spaces blank-active-chars) - (font-lock-add-keywords - nil - (list - ;; Show SPACEs - (list blank-space-regexp 1 blank-space t) - ;; Show HARD SPACEs - (list blank-hspace-regexp 1 blank-hspace t)) - t)) - (when (memq 'tabs blank-active-chars) - (font-lock-add-keywords - nil - (list - ;; Show TABs - (list blank-tab-regexp 1 blank-tab t)) - t)) - (when (memq 'trailing blank-active-chars) - (font-lock-add-keywords - nil - (list - ;; Show trailing blanks - (list (concat "\\(\\(" blank-trailing-regexp "\\)+\\)$") - 1 blank-trailing t)) - t)) - (when (or (memq 'lines blank-active-chars) - (memq 'lines-tail blank-active-chars)) - (font-lock-add-keywords - nil - (list - ;; Show "long" lines - (list - (format - "^\\([^\t\n]\\{%s\\}\\|[^\t\n]\\{0,%s\\}\t\\)\\{%d\\}%s\\(.+\\)$" - tab-width (1- tab-width) - (/ blank-line-column tab-width) - (let ((rem (% blank-line-column tab-width))) - (if (zerop rem) - "" - (format ".\\{%d\\}" rem)))) - (if (memq 'lines blank-active-chars) - 0 ; whole line - 2) ; line tail - blank-line t)) - t)) - (when (memq 'space-before-tab blank-active-chars) - (font-lock-add-keywords - nil - (list - ;; Show SPACEs before TAB - (list blank-space-before-tab-regexp - 1 blank-space-before-tab t)) - t)) - (when (memq 'indentation blank-active-chars) - (font-lock-add-keywords - nil - (list - ;; Show indentation SPACEs - (list blank-indentation-regexp - 1 blank-indentation t)) - t)) - (when (memq 'empty blank-active-chars) - (font-lock-add-keywords - nil - (list - ;; Show empty lines at beginning of buffer - (list blank-empty-at-bob-regexp - 1 blank-empty t)) - t) - (font-lock-add-keywords - nil - (list - ;; Show empty lines at end of buffer - (list blank-empty-at-eob-regexp - 1 blank-empty t)) - t)) - (when (memq 'space-after-tab blank-active-chars) - (font-lock-add-keywords - nil - (list - ;; Show SPACEs after TAB - (list blank-space-after-tab-regexp - 1 blank-space-after-tab t)) - t)) - ;; now turn on font lock and highlight blanks - (font-lock-mode 1))) - - -(defun blank-color-off () - "Turn off color visualization." - (when blank-active-chars - ;; turn off font lock - (font-lock-mode 0) - (when blank-font-lock - (setq blank-font-lock nil - font-lock-keywords blank-font-lock-keywords)) - ;; restore original font lock state - (font-lock-mode blank-font-lock-mode))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;;;; Hacked from visws.el (Miles Bader ) - - -(defvar blank-display-table nil - "Used to save a local display table.") -(make-variable-buffer-local 'blank-display-table) - -(defvar blank-display-table-was-local nil - "Used to remember whether a buffer initially had a local display table or not.") -(make-variable-buffer-local 'blank-display-table-was-local) - - -(defsubst blank-char-valid-p (char) - ;; This check should be improved!!! - (or (< char 256) - (char-valid-p char))) - - -(defun blank-legal-display-vector-p (vec) - "Return true if every character in vector VEC can be displayed." - (let ((i (length vec))) - (when (> i 0) - (while (and (>= (setq i (1- i)) 0) - (blank-char-valid-p (aref vec i)))) - (< i 0)))) - - -(defun blank-display-char-on () - "Turn on character display mapping." - (when blank-display-mappings - (let (vecs vec) - ;; Remember whether a buffer has a local display table. - (unless blank-display-table-was-local - (setq blank-display-table-was-local t - blank-display-table - (copy-sequence buffer-display-table))) - (unless buffer-display-table - (setq buffer-display-table (make-display-table))) - (dolist (entry blank-display-mappings) - (setq vecs (cdr entry)) - ;; Get a displayable mapping. - (while (and vecs - (not (blank-legal-display-vector-p (car vecs)))) - (setq vecs (cdr vecs))) - ;; Display a valid mapping. - (when vecs - (setq vec (copy-sequence (car vecs))) - (cond - ;; Any char except newline - ((not (eq (car entry) ?\n)) - (aset buffer-display-table (car entry) vec)) - ;; Newline char - display it - ((memq 'newline blank-active-chars) - ;; Only insert face bits on NEWLINE char mapping to avoid - ;; obstruction of other faces like TABs and (HARD) SPACEs - ;; faces, font-lock faces, etc. - (when (memq 'color blank-active-style) - (dotimes (i (length vec)) - ;; Due to limitations of glyph representation, the char - ;; code can not be above ?\x1FFFF. Probably, this will - ;; be fixed after Emacs unicode merging. - (or (eq (aref vec i) ?\n) - (> (aref vec i) #x1FFFF) - (aset vec i (make-glyph-code (aref vec i) - blank-newline))))) - ;; Display mapping - (aset buffer-display-table (car entry) vec)) - ;; Newline char - don't display it - (t - ;; Do nothing - ))))))) - - -(defun blank-display-char-off () - "Turn off character display mapping." - (and blank-display-mappings - blank-display-table-was-local - (setq blank-display-table-was-local nil - buffer-display-table blank-display-table))) - - -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - -(provide 'blank-mode) - - -(run-hooks 'blank-load-hook) - - -;; arch-tag: 1b1e2500-dbd4-4a26-8f7a-5a5edfd3c97e -;;; blank-mode.el ends here From b874d2a75fc3715d810b13085cadce1145a921c9 Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 30 Jan 2008 20:42:48 +0000 Subject: [PATCH 02/12] *** empty log message *** --- admin/FOR-RELEASE | 5 ----- 1 file changed, 5 deletions(-) diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE index 8541570cc6b..0aa881b13a0 100644 --- a/admin/FOR-RELEASE +++ b/admin/FOR-RELEASE @@ -50,11 +50,6 @@ http://lists.gnu.org/archive/html/bug-gnu-emacs/2007-09/msg00055.html * BUGS -** diff mode change for missing spaces in -u format. -Installed 2008-01-08 fix does not work right. -http://lists.gnu.org/archive/html/emacs-devel/2007-11/msg01990.html -http://lists.gnu.org/archive/html/emacs-devel/2008-01/msg01114.html - * DOCUMENTATION ** Check the Emacs Tutorial. From 772964f93a1e19099aa24ac2453240d4f729ccab Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 30 Jan 2008 21:51:43 +0000 Subject: [PATCH 03/12] Bump version number to 22.1.90. --- README | 2 +- lib-src/makefile.w32-in | 2 +- lisp/version.el | 2 +- lispref/elisp.texi | 2 +- .../Contents/Resources/English.lproj/InfoPlist.strings | 4 ++-- mac/src/Emacs.r | 8 ++++---- man/emacs.texi | 2 +- nt/emacs.rc | 8 ++++---- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README b/README index 1e1aa9ee7a7..1b536fbd0bf 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 See the end of the file for license conditions. -This directory tree holds version 22.1.50 of GNU Emacs, the extensible, +This directory tree holds version 22.1.90 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index b30240fc895..37e2e555742 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs .PHONY: $(ALL) -VERSION = 22.1.50 +VERSION = 22.1.90 LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \ -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \ diff --git a/lisp/version.el b/lisp/version.el index 1d2cc4fabcf..0d4ddb7c09a 100644 --- a/lisp/version.el +++ b/lisp/version.el @@ -30,7 +30,7 @@ (defconst emacs-copyright "Copyright (C) 2008 Free Software Foundation, Inc." "Short copyright string for this version of Emacs.") -(defconst emacs-version "22.1.50" "\ +(defconst emacs-version "22.1.90" "\ Version numbers of this version of Emacs.") (defconst emacs-major-version diff --git a/lispref/elisp.texi b/lispref/elisp.texi index 72ffac92f4b..8d168e13bca 100644 --- a/lispref/elisp.texi +++ b/lispref/elisp.texi @@ -7,7 +7,7 @@ @c Version of the manual and of Emacs. @c Please remember to update the edition number in README as well. @set VERSION 2.9 -@set EMACSVER 22.1.50 +@set EMACSVER 22.1.90 @dircategory Emacs @direntry diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings index 50ce2a05798..03caff39496 100644 --- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings +++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "22.1.50"; -CFBundleGetInfoString = "22.1.50, Copyright (C) 2008 Free Software Foundation, Inc."; +CFBundleShortVersionString = "22.1.90"; +CFBundleGetInfoString = "22.1.90, Copyright (C) 2008 Free Software Foundation, Inc."; diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r index cbc8bd73a1e..e5275d1b301 100644 --- a/mac/src/Emacs.r +++ b/mac/src/Emacs.r @@ -220,11 +220,11 @@ resource 'FREF' (129) { resource 'vers' (1) { 0x22, /* Major revision in BCD */ 0x1, /* Minor revision in BCD */ - development, /* development, alpha, beta, or final (release) */ - 50, /* Non-final release # */ + alpha, /* development, alpha, beta, or final (release) */ + 90, /* Non-final release # */ 0, /* Region code */ - "22.1.50", /* Short version number */ - "22.1.50, Copyright \0xa9 2008 " + "22.1.90", /* Short version number */ + "22.1.90, Copyright \0xa9 2008 " "Free Software Foundation, Inc." /* Long version number */ }; diff --git a/man/emacs.texi b/man/emacs.texi index 7addd7f83a7..70a1c014a9d 100644 --- a/man/emacs.texi +++ b/man/emacs.texi @@ -5,7 +5,7 @@ @c The edition number appears in several places in this file @set EDITION Sixteenth -@set EMACSVER 22.1.50 +@set EMACSVER 22.1.90 @copying This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},@* diff --git a/nt/emacs.rc b/nt/emacs.rc index 460527167c7..235e6d082e7 100644 --- a/nt/emacs.rc +++ b/nt/emacs.rc @@ -7,8 +7,8 @@ Emacs ICON icons\emacs.ico #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 22,1,50,0 - PRODUCTVERSION 22,1,50,0 + FILEVERSION 22,1,90,0 + PRODUCTVERSION 22,1,90,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -25,12 +25,12 @@ BEGIN BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0" - VALUE "FileVersion", "22, 1, 50, 0\0" + VALUE "FileVersion", "22, 1, 90, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0" - VALUE "ProductVersion", "22, 1, 50, 0\0" + VALUE "ProductVersion", "22, 1, 90, 0\0" VALUE "OLESelfRegister", "\0" END END From 0a74296ae1b43004fa68a32532b2cee1f7c270cc Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 30 Jan 2008 21:54:37 +0000 Subject: [PATCH 04/12] Regenerate. --- AUTHORS | 346 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 199 insertions(+), 147 deletions(-) diff --git a/AUTHORS b/AUTHORS index b88c0b69bda..b23f9bf61ba 100644 --- a/AUTHORS +++ b/AUTHORS @@ -3,14 +3,19 @@ Foundation's distribution of GNU Emacs. To show our appreciation for their public spirit, we list here in alphabetical order a condensed list of their contributions. +Aaron Hawley: changed tar-mode.el tutorial.el + Aaron Larson: changed bibtex.el -Aaron S. Hawley: changed files.texi files.el isearch.el misc.texi +Aaron S. Hawley: changed files.texi building.texi custom.texi files.el + glossary.texi isearch.el misc.texi Abraham Nahum: changed configure.in dgux4.h sysdep.c Abramo Bagnara: changed term.c +Adam Hupp: changed gdb-ui.el + Adrian Aichner: changed erc-log.el erc.el erc-autojoin.el erc-backend.el erc-dcc.el erc-members.el erc-nets.el erc-sound.el etags.c gnus-score.el @@ -21,7 +26,7 @@ Adrian Lanz: changed mail-source.el spam.el Agust,Am(Bn Mart,Am(Bn: changed flyspell.el ispell.el -Aidan Kehoe: changed lread.c mm-util.el erc.el objects.texi +Aidan Kehoe: changed lread.c mm-util.el erc.el latin-ltx.el objects.texi Ake Stenhoff: wrote imenu.el and changed cc-mode.el perl-mode.el @@ -32,10 +37,10 @@ Aki Vehtari: changed bibtex.el gnus-art.el gnus-score.el gnus-sum.el Alakazam Petrofsky: changed hanoi.el Alan Mackenzie: wrote cc-awk.el -and changed cc-cmds.el cc-mode.el cc-engine.el cc-defs.el cc-vars.el +and changed cc-cmds.el cc-engine.el cc-mode.el cc-defs.el cc-vars.el cc-langs.el cc-mode.texi cc-styles.el cc-align.el cc-fonts.el lread.c programs.texi cc-subword.el isearch.el lisp.el search.texi startup.el - subr.el text.texi buffers.texi cc-fix.el and 18 other files + subr.el text.texi buffers.texi bytecomp.el and 20 other files Alan Shutko: changed diary-lib.el calendar.el bindings.el cal-hebrew.el easy-mmode.el gnus-sum.el ibuf-ext.el ibuffer.el lunar.el macros.el @@ -72,6 +77,8 @@ Alexander Shopov: changed code-pages.el Alexander Zhuckov: changed ebrowse.c +Alexandre Julliard: wrote vc-git.el + Alexandre Oliva: wrote gnus-mlspl.el and changed unexelf.c format.el iris4d.h iris5d.h unexsgi.c @@ -79,7 +86,8 @@ Alexandre Veyrenc: changed fr-refcard.tex Alfred Correira: changed generic-x.el -Alfred M. Szmidt: changed compile.el html2text.el openbsd.h +Alfred M. Szmidt: changed compile.el html2text.el openbsd.h rmail.el + rmailsum.el Alfredo Finelli: changed TUTORIAL.it @@ -119,10 +127,10 @@ Andreas Leue: changed artist.el Andreas Luik: changed xfns.c xterm.c -Andreas Schwab: changed Makefile.in files.el lisp.h xdisp.c configure.in - alloc.c fns.c print.c coding.c editfns.c dired.el info.el eval.c - fileio.c simple.el buffer.c minibuf.c process.c xterm.c emacs.c - keyboard.c and 449 other files +Andreas Schwab: changed Makefile.in files.el lisp.h alloc.c xdisp.c + configure.in editfns.c fns.c print.c coding.c dired.el fileio.c info.el + eval.c process.c simple.el buffer.c minibuf.c window.c xterm.c emacs.c + and 451 other files Andreas Seltenreich: changed nnweb.el gnus.texi nnslashdot.el gnus-util.el mm-uu.el url-http.el battery.el comint.el easy-mmode.el @@ -160,10 +168,10 @@ Andy Petrusenco: changed w32term.c Anna M. Bigatti: wrote cal-html.el -Ari Roponen: changed atimer.c startup.el +Ari Roponen: changed atimer.c startup.el time-date.el -Arisawa Akihiro: changed mm-decode.el mm-view.el ps-print.el time.el - utf-8.el +Arisawa Akihiro: changed message.el mm-decode.el mm-view.el ps-print.el + time.el utf-8.el Arne Georg Gleditsch: changed gnus-sum.el @@ -255,7 +263,7 @@ and changed isearch.el sendmail.el Bob Halley: changed esh-io.el -Bob Rogers: changed ffap.el thingatpt.el +Bob Rogers: changed cperl-mode.el ffap.el thingatpt.el Bob Weiner: changed info.el quail.el @@ -332,20 +340,19 @@ Charlie Martin: wrote autoinsert.el Cheng Gao: changed MORE.STUFF flymake.el tips.texi url-dired.el 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 xdisp.c longlines.el files.texi info.el keyboard.c - compile.el custom.texi text.texi xterm.c frames.texi image-mode.el - mouse.el misc.texi startup.el wid-edit.el cus-theme.el - and 297 other files +Chong Yidong: changed cus-edit.el files.el simple.el longlines.el xdisp.c + display.texi custom.el files.texi image-mode.el info.el keyboard.c + compile.el custom.texi text.texi xterm.c frames.texi image.c mouse.el + misc.texi startup.el wid-edit.el and 300 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 syntax.c texnfo-upd.el x11fns.c xfns.c dired.el fileio.c hp9000s800.h indent.c info.el man.el and 17 other files -Chris Moore: changed dired.el hexl.el replace.el Makefile.in gnus-sum.el - isearch.el jka-cmpr-hook.el pgg-gpg.el pgg-pgp.el pgg-pgp5.el - tutorial.el wdired.el +Chris Moore: changed dired.el hexl.el replace.el Makefile.in comint.el + gnus-sum.el isearch.el jka-cmpr-hook.el pgg-gpg.el pgg-pgp.el + pgg-pgp5.el server.el shell.el tutorial.el wdired.el Chris Prince: changed w32term.c @@ -395,7 +402,7 @@ Craig Mcdaniel: changed sheap.c Daiki Ueno: wrote pgg-def.el pgg-gpg.el pgg-parse.el pgg-pgp.el pgg-pgp5.el pgg.el starttls.el -and changed gnus-sum.el mml2015.el gnus-agent.el gnus-srvr.el +and changed gnus-sum.el mml2015.el faces.el gnus-agent.el gnus-srvr.el message.texi mml1991.el pgg.texi Dale Gulledge: changed TUTORIAL.eo @@ -415,10 +422,10 @@ Dan Christensen: changed gnus-sum.el nnfolder.el gnus-art.el gnus-group.el gnus-registry.el gnus-score.el nndoc.el nnmail.el Dan Nicolaescu: wrote iris-ansi.el romanian.el -and changed term.el xterm.el hideshow.el isearch.el icon.el lisp.h - cus-edit.el faces.el font-lock.el grep.el sh-script.el eterm-color.ti - ibuffer.el rxvt.el vhdl-mode.el xterm.c bindings.el compile.el - dabbrev.el imenu.el outline.el and 166 other files +and changed xterm.el term.el hideshow.el vc-hg.el files.el isearch.el + sh-script.el icon.el lisp.h vc.el cus-edit.el faces.el font-lock.el + grep.el verilog-mode.el diff-mode.el eterm-color.ti ibuffer.el + replace.el rxvt.el term.c and 187 other files Daniel Brockman: changed cus-start.el format-spec.el ibuffer.el rcirc.el @@ -459,7 +466,7 @@ Dave Love: wrote autoarg.el autoconf.el benchmark.el cfengine.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 + vc-bzr.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 @@ -492,7 +499,8 @@ David Gillespie: wrote calc-aent.el calc-alg.el calc-arith.el calc-bin.el cl.texinfo complete.el edmacro.el and changed info.el bytecomp.el -David Hansen: changed nnrss.el cc-cmds.el lisp.el pcomplete.el tempo.el +David Hansen: changed nnrss.el cc-cmds.el em-dirs.el lisp.el pcomplete.el + tempo.el David Hedbor: changed gnus-art.el mm-decode.el mm-view.el gnus-agent.el gnus-cite.el gnus-cus.el gnus-eform.el gnus-group.el gnus-msg.el @@ -510,7 +518,7 @@ David J. Mackenzie: changed configure.in etags.c fakemail.c movemail.c David Kastrup: changed greek.el replace.el faq.texi search.c ange-ftp.el help.el mouse.el Makefile.in calc.el desktop.el keymaps.texi meta-mode.el process.c search.texi subr.el woman.el DEBUG DEVEL.HUMOR - MAILINGLISTS autoload.el browse-url.el and 37 other files + MAILINGLISTS advice.el autoload.el and 40 other files David K,Ae(Bgedal: wrote tempo.el and changed sendmail.el xmenu.c @@ -561,7 +569,7 @@ David Vazquez: changed m4-mode.el David Z. Maze: changed nnml.el nnrss.el -Davis Herring: changed timeclock.el +Davis Herring: changed desktop.el timeclock.el Deanna Phillips: changed configure.in @@ -587,11 +595,13 @@ Detlev Zundel: wrote re-builder.el Dhruva Krishnamurthy: changed makefile.w32-in +Dhuvra Krishnamurthy: changed makefile.w32-in w32proc.c + Diane Murray: changed erc.el erc-menu.el erc-backend.el erc-button.el erc-track.el erc-match.el erc-nets.el erc-list.el erc-autoaway.el erc-capab.el erc-nickserv.el erc-stamp.el erc-compat.el erc-fill.el - erc-goodies.el erc-ibuffer.el erc-log.el Makefile erc-dcc.el - erc-networks.el erc-nicklist.el and 32 other files + erc-goodies.el erc-ibuffer.el erc-log.el url-http.el Makefile + erc-dcc.el erc-networks.el and 36 other files Dick King: wrote uniquify.el @@ -615,7 +625,9 @@ Doug Cutting: wrote disass.el Doug Maxey: changed mouse.el -Drew Adams: changed speedbar.el +Drake Wilson: changed files.el + +Drew Adams: changed cus-edit.el speedbar.el E. Jay Berkenbilt: changed flyspell.el ispell.el window.h @@ -623,6 +635,8 @@ Ed L. Cashin: changed gnus-sum.el imap.el Ed Swarthout: changed hexl.el +Eduard Wiebe: changed flymake.texi + Eduardo Mu,Aq(Boz: changed dired.el ls-lisp.el Edward M. Reingold: wrote cal-china.el cal-coptic.el cal-french.el @@ -636,7 +650,7 @@ and changed diary.el tex-mode.el cal-tex.el cal-mayan.el holiday.el Edward O'connor: changed erc.el erc-viper.el erc-log.el erc-track.el viper.el erc-backend.el erc-chess.el erc-dcc.el erc-ezbounce.el erc-goodies.el erc-list.el erc-macs.el erc-match.el erc-ring.el - erc-stamp.el goto-addr.el python.el + erc-stamp.el goto-addr.el python.el url-auth.el Edwin Steiner: changed gnus-nocem.el @@ -651,12 +665,12 @@ Eli Tziperman: wrote rmail-spam-filter.el Eli Zaretskii: wrote codepage.el rxvt.el tty-colors.el and changed msdos.c Makefile.in makefile.w32-in files.el info.el fileio.c - startup.el mainmake.v2 config.bat rmail.el menu-bar.el pc-win.el - simple.el msdos.h internal.el xfaces.c emacs.c frame.c INSTALL dosfns.c - faces.el and 532 other files + startup.el mainmake.v2 rmail.el config.bat menu-bar.el simple.el + pc-win.el msdos.h internal.el xfaces.c emacs.c frame.c INSTALL dosfns.c + mule-cmds.el and 536 other files Emanuele Giaquinta: changed rxvt.el configure.in etags.c frame.el - sh-script.el text.texi + gnus-faq.texi sh-script.el text.texi Emilio C. Lopes: changed woman.el cmuscheme.el help.el vc.el advice.el animate.el apropos.el artist.el bookmark.el cal-menu.el calc-prog.el @@ -682,7 +696,7 @@ and changed mh-utils.el mh-e.el mh-comp.el mh-mime.el Eric Eide: changed gnus-xmas.el Eric Hanchrow: changed TUTORIAL.es abbrev.el autorevert.el cperl-mode.el - delphi.el dired.el emacsclient.c erc.el ispell.el make-dist + delphi.el dired.el emacsclient.c erc.el ibuf-ext.el ispell.el make-dist ,AI(Bric Jacoboni: changed fr-refcard.tex @@ -747,10 +761,10 @@ Florian Weimer: changed message.el gnus.el coding.c gnus.texi mm-util.el Francesc Rocher: changed cus-start.el macterm.c w32term.c xdisp.c xterm.c Francesco Potort,Al(B: wrote cmacexp.el -and changed etags.c man.el delta.h undigest.el etags.1 comint.el - configure.in uniquify.el latin-post.el maintaining.texi rmail.el +and changed etags.c man.el delta.h etags.1 undigest.el comint.el + configure.in maintaining.texi uniquify.el latin-post.el rmail.el Makefile.in etags.el latin-alt.el sgml-mode.el data.c european.el - filelock.c files.el generic-x.el gud.el and 43 other files + filelock.c files.el generic-x.el gud.el and 44 other files Francis J. Wright: wrote woman.el and changed dired.el comint.el files.el @@ -853,10 +867,10 @@ Giorgos Keramidas: changed configure.in MACHINES amdx86-64.h apropos.el Giuseppe Scrivano: changed buffer.c configure.in sysdep.c xsmfns.c Glenn Morris: changed f90.el diary-lib.el calendar.el fortran.el - calendar.texi appt.el sh-script.el Makefile.in timeclock.el cal-menu.el - files.el complete.el configure.in programs.texi startup.el MACHINES - abbrevs.texi cal-hebrew.el cal-islam.el emacs.texi faq.texi - and 151 other files + calendar.texi COPYING appt.el Makefile.in files.el sh-script.el + timeclock.el cal-menu.el configure.in simple.el tex-mode.el calc.texi + complete.el fr-refcard.tex orgcard.tex programs.texi startup.el + and 245 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -892,6 +906,8 @@ Gustav H,Ae(Bllberg: changed compile.el rect.el Guy Geens: changed gnus-score.el +Gwern Branwen: changed browse-url.el + G,Av(Bran Uddeborg: changed isc4-1.h Hallvard B. Furuseth: changed gnus-util.el editfns.c gnus-cache.el @@ -985,12 +1001,18 @@ Inoue Seiichiro: changed xterm.c xfns.c xterm.h International Business Machines: changed emacs.c fileio.c ibmrt-aix.h ibmrt.h process.c sysdep.c unexec.c +Irie Tetsuya: changed gnus.texi message.texi + Ishikawa Chiaki: changed aviion.h dgux.h Istvan Marko: changed gnus-agent.el xfns.c +Itai Zukerman: changed mm-decode.el + Ivan Boldyrev: changed mml1991.el +Ivan Kanis: wrote vc-hg.el + Ivan Zakharyaschev: changed codepage.el lread.c Ivar Rummelhoff: wrote winner.el @@ -1032,9 +1054,9 @@ and changed bytecode.c mail-extr.el subr.el Jan Dj,Ad(Brv: wrote dnd.el x-dnd.el and changed gtkutil.c xterm.c xfns.c xmenu.c xterm.h configure.in - gtkutil.h x-win.el Makefile.in keyboard.c frames.texi config.in - xselect.c emacs.c alloc.c xlwmenu.c xresources.texi frame.c startup.el - xdisp.c cus-start.el and 176 other files + x-win.el gtkutil.h keyboard.c Makefile.in frames.texi config.in + xselect.c emacs.c alloc.c xlwmenu.c xresources.texi startup.el frame.c + xdisp.c xfaces.c and 177 other files Jan Nieuwenhuizen: changed info.el TUTORIAL.nl emacs.c emacsclient.c gnus-start.el gud.el nnmh.el server.el startup.el @@ -1048,17 +1070,17 @@ Jan Vroonhof: changed gnus-cite.el gnus-msg.el nntp.el Jan-Hein Buhrman: changed ange-ftp.el env.el Jari Aalto: changed add-log.el filecache.el gnus-art.el lisp-mnt.el - nnmail.el apropos.el autorevert.el compile.el cperl-mode.el debug.el - executable.el files.el finder.el font-lock.el gnus.el gnus.texi grep.el - ls-lisp.el man.el sendmail.el terminal.el + man.el nnmail.el apropos.el autorevert.el comint.el compile.el + cperl-mode.el debug.el executable.el files.el finder.el font-lock.el + gnus.el gnus.texi grep.el ls-lisp.el sendmail.el terminal.el Jason Merrill: changed gnus-sum.el gnus-salt.el imap.el nnfolder.el Jason Rumney: wrote w32-vars.el -and changed w32fns.c w32term.c w32menu.c w32-win.el w32term.h - makefile.w32-in w32.c w32bdf.c w32-fns.el w32select.c w32console.c - w32gui.h w32proc.c keyboard.c mule-cmds.el emacs.c fileio.c w32bdf.h - w32inevt.c config.nt configure.bat and 84 other files +and changed w32fns.c w32term.c w32menu.c w32-win.el makefile.w32-in + w32term.h w32.c w32bdf.c w32-fns.el w32proc.c w32select.c w32console.c + mule-cmds.el w32gui.h keyboard.c emacs.c fileio.c nmake.defs w32bdf.h + w32inevt.c xdisp.c and 93 other files Jay Belanger: changed calc.texi calc.el calc-ext.el calc-embed.el calc-aent.el calc-prog.el calc-arith.el calc-help.el calc-lang.el @@ -1074,7 +1096,7 @@ Jean-Philippe Theberge: wrote thumbs.el Jeff Dwork: changed ehelp.el facemenu.el -Jeff Miller: changed appt.el +Jeff Miller: changed appt.el calendar.el Jeff Morgenthaler: changed flow-ctrl.el vt200.el vt201.el vt220.el vt240.el @@ -1125,7 +1147,8 @@ and changed keyboard.c xterm.c xfns.c Makefile.in window.c process.c Jim Kingdon: changed MACHINES SERVICE emacsclient.c emacs.tex hp300bsd.h rmail.el -Jim Meyering: changed Makefile.in grep-changelog +Jim Meyering: changed Makefile.in autoinsert.el copyright.el + grep-changelog Jim Radford: changed gnus-start.el @@ -1168,7 +1191,7 @@ Joe Ramey: changed filelock.c rmailsum.el Joe Reiss: changed gnus-art.el Joe Wells: wrote apropos.el mail-extr.el resume.el -and changed arc-mode.el +and changed arc-mode.el tex-mode.el Joel N. Weber Ii: changed comint.el make-dist @@ -1178,13 +1201,15 @@ Joev Dubach: changed nntp.el Johan Bockg,Ae(Brd: changed erc.el erc-backend.el cl-macs.el erc-match.el custom.el erc-nickserv.el erc-ring.el erc-speak.el erc-track.el - simple.el align.el bytecomp.el calendar.el cl.texi dired-aux.el - dired-x.el display.texi erc-bbdb.el erc-button.el erc-compat.el - erc-dcc.el and 16 other files + simple.el xterm.el align.el browse-url.el bytecomp.el calendar.el + cl.texi dired-aux.el dired-x.el display.texi erc-bbdb.el erc-button.el + and 23 other files Johan Vromans: wrote forms-d2.el forms.el iso-acc.el and changed complete.el +Johannes Weiner: changed lisp-mode.el + John Basrai: changed man.el John F. Carr: changed dired.c @@ -1206,10 +1231,9 @@ John J Foerch: changed erc-stamp.el John Mongan: changed f90.el John Paul Wallington: changed ibuffer.el ibuf-ext.el subr.el files.el - help-fns.el rmail.el thumbs.el fns.c bindings.el bytecomp.el - cus-theme.el info.el re-builder.el simple.el startup.el xfns.c - apropos.el arc-mode.el browse-url.el comint.el cus-start.el - and 117 other files + help-fns.el rmail.el thumbs.el fns.c xfns.c bindings.el bytecomp.el + cus-theme.el info.el re-builder.el simple.el startup.el apropos.el + arc-mode.el browse-url.el comint.el cus-start.el and 117 other files John Robinson: wrote bg-mouse.el @@ -1282,10 +1306,10 @@ Jouni K. Sepp,Ad(Bnen: changed gnus.texi nnimap.el mm-url.el Juan Le,As(Bn Lahoz Garc,Am(Ba: wrote wdired.el and changed files.el perl-mode.el -Juanma Barranquero: changed makefile.w32-in subr.el faces.el help-fns.el - files.el simple.el buffer.c w32fns.c emacsclient.c replace.el - vhdl-mode.el bs.el cperl-mode.el eval.c org.el process.c xdisp.c - idlwave.el sh-script.el window.c ada-mode.el and 629 other files +Juanma Barranquero: changed makefile.w32-in subr.el faces.el files.el + help-fns.el bs.el w32fns.c buffer.c simple.el emacsclient.c replace.el + eval.c org.el idlwave.el ido.el process.c vhdl-mode.el window.c xdisp.c + allout.el cperl-mode.el and 651 other files Juergen Hoetzel: changed url-handlers.el @@ -1299,10 +1323,10 @@ Junio Hamano: changed window.el Jure Cuhalev: changed ispell.el -Juri Linkov: changed info.el simple.el replace.el isearch.el compile.el +Juri Linkov: changed info.el simple.el isearch.el replace.el compile.el faces.el display.texi grep.el descr-text.el cus-edit.el dired.el dired-aux.el edebug.el compare-w.el files.el lisp-mode.el lisp.el - modes.texi mule.el desktop.el files.texi and 221 other files + man.el menu-bar.el modes.texi mule.el and 224 other files Justin Sheehy: changed gnus-sum.el nntp.el @@ -1332,9 +1356,9 @@ Kanematsu Daiji: changed nnimap.el Karl Berry: changed emacs.texi info.texi elisp.texi anti.texi display.texi emacs-xtra.texi filelock.c gnu.texi mule.texi texinfo.tex - text.texi building.texi cmdargs.texi control.texi copyright.el - custom.texi customize.texi dired.c dired.texi faq.texi frames.texi - and 72 other files + text.texi .cvsignore building.texi cmdargs.texi control.texi + copyright.el custom.texi customize.texi dired.c dired.texi faq.texi + and 77 other files Karl Chen: changed files.el align.el cc-vars.el gnus-art.el help-mode.el jka-cmpr-hook.el make-mode.el perl-mode.el python.el tex-mode.el @@ -1364,9 +1388,9 @@ Katsuhiro Hermit Endo: changed gnus-group.el gnus-spec.el Katsumi Yamaoka: wrote canlock.el and changed gnus-art.el message.el gnus-sum.el gnus.texi mm-decode.el - mm-view.el gnus-util.el gnus-msg.el mm-util.el gnus.el lpath.el - gnus-group.el gnus-start.el rfc2047.el dgnushack.el mm-uu.el nntp.el - gnus-agent.el mml.el nnrss.el message.texi and 72 other files + mm-view.el gnus-util.el gnus.el mm-util.el gnus-msg.el gnus-agent.el + gnus-start.el lpath.el nntp.el rfc2047.el gnus-group.el dgnushack.el + mm-uu.el mml.el nnrss.el message.texi and 76 other files Kaveh R. Ghazi: changed delta88k.h xterm.c @@ -1442,10 +1466,10 @@ Kevin Rodgers: changed compile.el mailabbrev.el dired-x.el files.el and 5 other files Kevin Ryde: wrote info-xref.el -and changed info-look.el info.el arc-mode.el cl.texi gnus-art.el - gnus-sum.el mailcap.el mule.el os.texi text.texi MORE.STUFF cal-dst.el - calendar.texi cc-align.el cmdargs.texi compile.texi display.texi - em-alias.el em-dirs.el em-hist.el em-unix.el and 19 other files +and changed info-look.el info.el mule.el arc-mode.el cl.texi gnus-art.el + gnus-sum.el mailcap.el os.texi text.texi MORE.STUFF cal-dst.el + calendar.texi cc-align.el cmdargs.texi compilation.txt compile.el + compile.texi custom.texi display.texi em-alias.el and 22 other files Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el keypad.el kmacro.el @@ -1457,6 +1481,8 @@ and changed xdisp.c dispextern.h process.c simple.el window.c keyboard.c Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-start.el gnus-win.el gnus-xmas.el gnus.texi message.el nndraft.el nnml.el +Kimit Yada: changed copyright.el + Kishore Kumar: changed terminal.el Klaus Straubinger: changed url-http.el url-history.el url-cookie.el @@ -1472,6 +1498,8 @@ Kobayashi Yasuhiro: changed w32fns.c configure.bat indent.c info.el Kohtala Marko: changed info.el +Konstantin Novitsky: changed python.el + Koseki Yoshinori: wrote iimage.el and changed nnmail.el @@ -1529,11 +1557,12 @@ Lasse Rasinen: changed gnus-start.el Laurent Martelli: changed mm-decode.el -Lawrence Mitchell: wrote erc-backend.el erc-log.el erc-nicklist.el +Lawrence Mitchell: wrote erc-backend.el erc-log.el and changed erc.el erc-match.el erc-nets.el erc-nickserv.el erc-button.el erc-compat.el erc-dcc.el erc-fill.el erc-list.el erc-track.el Makefile erc-autoaway.el erc-autojoin.el erc-bbdb.el erc-ezbounce.el erc-menu.el - erc-netsplit.el erc-notify.el erc-sound.el subr.el tempo.el + erc-netsplit.el erc-nicklist.el erc-notify.el erc-sound.el subr.el + tempo.el Lawrence R. Dodd: wrote dired-x.el and changed fortran.el ispell.el sendmail.el cmuscheme.el comint.el @@ -1588,7 +1617,7 @@ and changed emacsclient.c emacsserver.c etags.c lisp.h movemail.c Maciek Pasternacki: changed nnrss.el Magnus Henoch: changed url-http.el ispell.el url.el url-gw.el - url-parse.el url-proxy.el autoinsert.el rcirc.el url-https.el + url-parse.el url-proxy.el autoinsert.el process.c rcirc.el url-https.el Manuel Serrano: wrote flyspell.el @@ -1697,10 +1726,10 @@ Martin Lorentzon: changed vc.el vc-cvs.el vc-hooks.el vc-rcs.el Martin Neitzel: changed sc.el -Martin Rudalics: changed cus-edit.el wid-edit.el cus-start.el files.el - flyspell.el font-lock.el complete.el insdel.c ispell.el macmenu.c - syntax.c table.el w32menu.c wdired.el whitespace.el window.el xdisp.c - xmenu.c backups.texi buffer.c buffer.h and 36 other files +Martin Rudalics: changed cus-start.el cus-edit.el files.el wid-edit.el + window.el flyspell.el font-lock.el mouse.el syntax.c xdisp.c compile.el + complete.el dired.el frame.c frame.el insdel.c ispell.el keyboard.c + macmenu.c macterm.c msdos.c and 64 other files Martin Stjernholm: wrote cc-bytecomp.el and changed cc-engine.el cc-cmds.el cc-langs.el cc-defs.el cc-mode.el @@ -1708,6 +1737,8 @@ and changed cc-engine.el cc-cmds.el cc-langs.el cc-defs.el cc-mode.el cc-mode.texi Makefile.in cc-guess.el cc-mode-19.el ack.texi awk-mode.el cc-awk.el cc-lobotomy.el cc-make.el cc-style.el and 5 other files +Martin Svenson: changed python.el + Martin Thornquist: changed gnus-group.el gnus-topic.el Masahiko Sato: wrote vip.el @@ -1719,9 +1750,9 @@ and changed gnuspost.el Masatake Yamato: wrote cc-subword.el ld-script.el and changed etags.el asm-mode.el hexl.el xdisp.c bindings.el man.el - simple.el wid-edit.el add-log.el compile.el faces.el pcvs.el + simple.el wid-edit.el add-log.el compile.el etags.c faces.el pcvs.el register.el ruler-mode.el buffer.c cus-face.el dired-x.el display.texi - etags.c font-lock.el gdb-ui.el and 59 other files + font-lock.el gdb-ui.el and 60 other files Masayuki Ataka: changed texinfmt.el texinfo.el characters.el cmuscheme.el make-mode.el @@ -1765,9 +1796,9 @@ Max Froumentin: changed gnus-art.el mml.el Michael Albinus: wrote tramp-ftp.el tramp-smb.el and changed tramp.el tramp.texi tramp-vc.el ange-ftp.el files.el - tramp-util.el files.texi nnml.el tramp-uu.el vc.el dired-x.el dired.el - faq.texi find-dired.el locate.el mini.texi rcompile.el tramp*.el - trampver.el trampver.texi woman.el + tramp-util.el files.texi nnml.el tramp-uu.el trampver.el vc.el + dired-x.el dired.el faq.texi ffap.el find-dired.el locate.el mini.texi + rcompile.el socks.el tramp*.el and 4 other files Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h unexec.c @@ -1801,15 +1832,17 @@ Michael Kifer: wrote cal-x.el ediff-diff.el ediff-help.el ediff-hook.el ediff-vers.el ediff-wind.el ediff.el viper-cmd.el viper-ex.el viper-init.el viper-keym.el viper-macs.el viper-mous.el viper-util.el viper.el -and changed ediff-merge.el ediff*.el viper*.el ediff-hooks.el menu-bar.el +and changed ediff*.el ediff-merge.el viper*.el ediff-hooks.el menu-bar.el viper-utils.el appt.el desktop.el ediff-meta.el ediff-nult.el ediff.texi viper-mouse.el viper.texi +Michael Mcnamara: wrote verilog-mode.el + Michael Olson: changed erc.el erc-backend.el erc.texi Makefile erc-autoaway.el erc-log.el erc-stamp.el erc-identd.el erc-list.el erc-track.el erc-match.el erc-bbdb.el erc-dcc.el erc-notify.el - erc-ibuffer.el erc-pcomplete.el erc-spelling.el erc-compat.el - erc-goodies.el erc-nicklist.el ERC-NEWS and 44 other files + erc-ibuffer.el erc-nicklist.el erc-pcomplete.el erc-spelling.el + erc-compat.el erc-goodies.el ERC-NEWS and 44 other files Michael Piotrowski: changed gnus-sum.el ps-print.el @@ -1842,7 +1875,7 @@ Michal Nazarewicz: changed ispell.el Micha,Ak(Bl Cadilhac: changed ido.el fill.el ispell.el Makefile anti.texi battery.el blackbox.el bs.el cmuscheme.el complete.el cus-edit.el dispnew.c faq.texi flyspell.el footnote.el fr-refcard.ps fr-refcard.tex - glasses.el info.el life.el lpr.el and 12 other files + glasses.el gud.el info.el life.el and 14 other files Michelangelo Grigni: wrote ffap.el and changed gnus-score.el @@ -1877,7 +1910,7 @@ Miles Bader: wrote button.el image-file.el macroexp.el minibuf-eldef.el and changed comint.el faces.el simple.el editfns.c xfaces.c info.el xdisp.c minibuf.c wid-edit.el xterm.c subr.el window.el cus-edit.el diff-mode.el dispextern.h quick-install-emacs xfns.c help.el lisp.h - textprop.c bytecomp.el and 242 other files + textprop.c bytecomp.el and 245 other files Miyashita Hisashi: changed ccl.c coding.c coding.h mule-cmds.el mule-conf.el mule.el pop3.el @@ -1932,9 +1965,10 @@ Niall Mansfield: changed etags.c Nick Roberts: wrote gdb-ui.el and changed gud.el building.texi tooltip.el speedbar.el bindings.el - thumbs.el xt-mouse.el .gdbinit DEBUG cc-mode.el t-mouse.el frames.texi - subr.el comint.el display.texi help-mode.el compile.el descr-text.el - dired.el gud-display.pbm speedbar.texi and 116 other files + thumbs.el xt-mouse.el .gdbinit DEBUG cc-mode.el subr.el t-mouse.el + comint.el frames.texi display.texi help-mode.el compile.el + descr-text.el dired.el gud-display.pbm speedbar.texi + and 120 other files Nico Francois: changed w32fns.c w32inevt.c w32menu.c @@ -1954,7 +1988,7 @@ Nobuyuki Hikichi: changed news-risc.h Noel Cragg: changed mh-junk.el -Norbert Koch: changed gnus-score.el +Norbert Koch: changed gnus-msg.el gnus-score.el Nozomu Ando: changed unexmacosx.c alloc.c buffer.c mips.h pmax.h smtpmail.el sysselect.h unexelf.c @@ -2091,6 +2125,10 @@ Peter Kleiweg: wrote ps-mode.el Peter Liljenberg: wrote elint.el +Peter O'gorman: changed configure.in frame.h gtkutil.c termhooks.h + +Peter Povinec: changed term.el + Peter Runestig: changed makefile.w32-in configure.bat dos-w32.el emacs.rc envadd.bat gmake.defs multi-install-info.bat nmake.defs w32fns.c zone-mode.el @@ -2111,12 +2149,16 @@ Peter Von Der Ahe: changed gnus-ems.el Peter Whaite: changed data.c +Petr Salinger: changed configure.in gnu-kfreebsd.h + Petri Kaurinkoski: changed configure.in iris4d.h irix6-0.h irix6-5.h usg5-4.h +Phil Sung: changed wdired.el + Philippe Schnoebelen: wrote gomoku.el mpuz.el -Philippe Waroquiers: changed etags.el +Philippe Waroquiers: changed etags.el term.c Piet Van Oostrum: changed data.c fileio.c flyspell.el make-package smtpmail.el @@ -2148,11 +2190,11 @@ Rajesh Vaidheeswarran: wrote whitespace.el and changed ffap.el Ralf Angeli: wrote scroll-lock.el -and changed w32fns.c tex-mode.el comint.el flow-fill.el frame.el - gnus-art.el killing.texi mm-view.el pcl-cvs.texi reftex-auc.el +and changed w32fns.c reftex.el tex-mode.el comint.el flow-fill.el + frame.el gnus-art.el killing.texi mm-view.el pcl-cvs.texi reftex-auc.el reftex-cite.el reftex-dcr.el reftex-global.el reftex-index.el reftex-parse.el reftex-ref.el reftex-sel.el reftex-toc.el - reftex-vars.el reftex.el reftex.texi and 4 other files + reftex-vars.el reftex.texi and 4 other files Ralf Fassel: changed dabbrev.el files.el fill.el iso-acc.el tar-mode.el @@ -2175,10 +2217,10 @@ and changed gnus-art.el gnus-msg.el gnus.texi message.el nnmail.el Reiner Steib: wrote gmm-utils.el and changed gnus-art.el gnus.texi message.el gnus-sum.el gnus.el - gnus-group.el gnus-faq.texi gnus-util.el mml.el gnus-score.el - gnus-start.el message.texi mm-util.el gnus-agent.el gnus-msg.el spam.el + gnus-group.el gnus-faq.texi mm-util.el gnus-start.el gnus-util.el + message.texi mml.el gnus-score.el gnus-agent.el gnus-msg.el spam.el files.el spam-report.el mm-decode.el nnmail.el nnweb.el - and 166 other files + and 168 other files Remek Trzaska: changed gnus-ems.el @@ -2188,7 +2230,10 @@ Renaud Rioboo: changed nnmail.el Ren,Ai(B Kyllingstad: changed pcomplete.el -Reto Zimmermann: changed vhdl-mode.el +Reto Zimmermann: wrote vera-mode.el +and changed vhdl-mode.el + +Riccardo Murri: changed vc-bzr.el tls.el Richard Bielawski: changed modes.texi @@ -2206,10 +2251,10 @@ Richard M. Heiberger: changed tex-mode.el Richard M. Stallman: wrote [The original GNU Emacs and numerous files] easymenu.el font-lock.el image-mode.el menu-bar.el paren.el -and changed keyboard.c files.el simple.el xterm.c xdisp.c rmail.el - fileio.c process.c sysdep.c xfns.c buffer.c Makefile.in window.c - configure.in subr.el startup.el emacs.c editfns.c sendmail.el info.el - dispnew.c and 1334 other files +and changed keyboard.c files.el simple.el xterm.c xdisp.c fileio.c + rmail.el process.c sysdep.c xfns.c buffer.c Makefile.in window.c + configure.in subr.el startup.el emacs.c editfns.c info.el sendmail.el + dispnew.c and 1336 other files Richard Mlynarik: wrote cl-indent.el ebuff-menu.el ehelp.el env.c rfc822.el terminal.el yow.el @@ -2292,6 +2337,9 @@ Russ Allbery: changed message.el Ryan Yeske: wrote rcirc.el and changed ffap.el ispell.el rmailsum.el simple.el testcover.el + webjump.el + +Ryo Yoshitake: changed mac.c Ryszard Kubiak: changed ogonek.el @@ -2310,7 +2358,7 @@ Sam Steingold: wrote gulp.el midnight.el and changed cl-indent.el font-lock.el ange-ftp.el mouse.el tex-mode.el vc-cvs.el add-log.el bindings.el bookmark.el debug.el diary-lib.el dired.el pcvs.el sgml-mode.el simple.el browse-url.el buff-menu.el - bytecomp.el cc-mode.el compile.el etags.el and 96 other files + bytecomp.el cc-mode.el compile.el etags.el and 97 other files Samuel Tardieu: changed smime.el @@ -2341,7 +2389,7 @@ Scott M. Meyers: changed cmacexp.el Sean Neakums: changed gnus-msg.el gnus-uu.el -Sean O'rourke: changed ibuf-ext.el +Sean O'rourke: changed find-func.el ibuf-ext.el Sebastian Kremer: wrote dired-aux.el dired-x.el dired.el ls-lisp.el and changed add-log.el @@ -2385,10 +2433,10 @@ Simon Josefsson: wrote dig.el dns-mode.el flow-fill.el fringe.el imap.el sieve-manage.el sieve-mode.el sieve.el smime.el starttls.el tls.el url-imap.el and changed message.el gnus-sum.el gnus-art.el smtpmail.el pgg.el - mml2015.el pgg-gpg.el gnus-agent.el mml.el mm-decode.el mml1991.el + pgg-gpg.el mml2015.el gnus-agent.el mml.el mm-decode.el mml1991.el gnus-group.el gnus-msg.el pgg-pgp5.el gnus-sieve.el browse-url.el gnus-int.el gnus.el pgg-parse.el gnus-cache.el mail-source.el - and 89 other files + and 88 other files Simon Leinen: changed smtpmail.el Makefile Makefile.in cm.c cm.h hpux9.h indent.c process.c sc.texinfo sgml-mode.el term.c xfns.c xmenu.c @@ -2412,13 +2460,13 @@ Sriram Karra: changed message.el Stanislav Shalunov: wrote uce.el -Stefan Monnier: wrote bibtex.el cvs-status.el diff-mode.el log-edit.el - log-view.el pcvs-defs.el pcvs-info.el pcvs-parse.el pcvs-util.el - reveal.el smerge-mode.el +Stefan Monnier: wrote bibtex-style.el bibtex.el css-mode.el cvs-status.el + diff-mode.el log-edit.el log-view.el pcvs-defs.el pcvs-info.el + pcvs-parse.el pcvs-util.el reveal.el smerge-mode.el vc-mtn.el and changed vc.el font-lock.el pcvs.el newcomment.el subr.el lisp.h - keyboard.c fill.el keymap.c tex-mode.el alloc.c compile.el files.el - regex.c simple.el easy-mmode.el syntax.c vc-hooks.el info.el xdisp.c - sh-script.el and 519 other files + keyboard.c tex-mode.el fill.el keymap.c compile.el vc-hooks.el files.el + simple.el alloc.c easy-mmode.el regex.c syntax.c info.el xdisp.c + sh-script.el and 528 other files Steinar Bang: changed imap.el @@ -2447,7 +2495,7 @@ and changed time-stamp.el mh-e.el mh-comp.el mh-utils.el mh-customize.el Stephen J. Turnbull: changed ediff-init.el strings.texi subr.el Stephen Leake: changed ada-mode.el ada-xref.el ada-stmt.el ada-mode.texi - ada-prj.el align.el + ada-prj.el align.el pcvs-parse.el vhdl-mode.el Steve Fisk: wrote cal-tex.el @@ -2494,8 +2542,9 @@ Sun Yijiang: changed TUTORIAL.cn Sundar Narasimhan: changed rnews.el rnewspost.el -Sven Joachim: changed arc-mode.el de-refcard.tex files.el files.texi - help.el mule.texi sed3v2.inp sh-script.el simple.el +Sven Joachim: changed arc-mode.el de-refcard.tex dired-aux.el files.el + files.texi gnus.texi help.el mule.texi sed3v2.inp sh-script.el + simple.el vc-bzr.el view.el Svend Tollak Munkejord: changed deuglify.el @@ -2505,8 +2554,8 @@ and changed appt.el compile.el dired.c etags.c ldap.el makefile.w32-in Takahashi Kaoru: changed texinfmt.el -Takahashi Naoto: wrote cyrillic.el ethio-util.el ethiopic.el latin-alt.el - latin-ltx.el latin-post.el utf-8.el +Takahashi Naoto: wrote cyrillic.el ethio-util.el ethiopic.el latin-ltx.el + latin-post.el utf-8.el and changed fontset.el mule-conf.el quail.el Takai Kousuke: changed ccl.el @@ -2538,10 +2587,10 @@ Tetsurou Okazaki: changed log-edit.el xterm.c Theodore Jump: changed w32-win.el w32faces.c Thien-Thi Nguyen: wrote hideshow.el make-mms-derivative.el -and changed ewoc.el info.el processes.texi zone.el Makefile.in vc.el - fileio.c lisp-mode.el scheme.el text.texi TUTORIAL.it bindat.el +and changed ewoc.el info.el processes.texi zone.el Makefile.in + lisp-mode.el vc.el fileio.c scheme.el text.texi TUTORIAL.it bindat.el dcl-mode.el display.texi files.el gnus.texi pcvs.el startup.el sysdep.c - vc-rcs.el MORE.STUFF and 129 other files + vc-rcs.el MORE.STUFF and 134 other files Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el @@ -2588,8 +2637,8 @@ Tom Houlder: wrote mantemp.el Tom Tromey: wrote tcl.el and changed makefile.el buffer.c make-mode.el add-log.el blackbox.el - buff-menu.el doc.c emacsclient.c info.el man.el replace.el xfns.c - xterm.c xterm.h + buff-menu.el diff-mode.el doc.c emacsclient.c gdb-ui.el info.el man.el + replace.el xfns.c xterm.c xterm.h Tom Wurgler: wrote emacs-lock.el and changed subr.el @@ -2638,8 +2687,9 @@ and changed calendar.texi newsticker.texi Makefile.in Ulrich Leodolter: changed w32proc.c -Ulrich Mueller: changed gud.el Makefile.in XMakeAssoc.c case-table.el - fortran.el iso-acc.el sysdep.c +Ulrich Mueller: changed gud.el ChgPane.c ChgSel.c Makefile.in + XMakeAssoc.c case-table.el files.el fortran.el iso-acc.el simple.el + sysdep.c Ulrik Vieth: wrote meta-mode.el and changed files.el @@ -2657,7 +2707,7 @@ Victor Zandy: wrote zone.el Viktor Dukhovni: wrote unexsunos4.c -Ville Skytt,Ad(B: changed mh-comp.el pgg.el tcl.el +Ville Skytt,Ad(B: changed mh-comp.el pgg.el tcl.el tramp-vc.el Vincent Del Vecchio: changed info.el mh-utils.el @@ -2665,8 +2715,8 @@ Vinicius Jose Latorre: wrote delim-col.el ebnf-abn.el ebnf-bnf.el ebnf-dtd.el ebnf-ebx.el ebnf-iso.el ebnf-otz.el ebnf-yac.el ebnf2ps.el printing.el ps-mule.el and changed ps-print.el ps-prin1.ps ps-bdf.el ps-prin0.ps ps-prin3.ps - ps-prin2.ps lpr.el ps-print.ps subr.el TUTORIAL.pt_BR easymenu.el - loading.texi ps-print-def.el ps-print0.ps ps-vars.el + ps-prin2.ps lpr.el subr.el TUTORIAL.pt_BR easymenu.el loading.texi + ps-print-def.el ps-print.ps ps-print0.ps ps-vars.el Vivek Dasmohapatra: changed emacs.c erc-backend.el erc.el sh-script.el xterm.c xterm.h @@ -2682,10 +2732,10 @@ Wayne Mesard: wrote hscroll.el Werner Benger: changed keyboard.c Werner Lemberg: wrote sisheng.el vntelex.el -and changed TUTORIAL.de Makefile.in calc.texi chinese.el czech.el +and changed TUTORIAL.de Makefile.in calc.texi chinese.el czech.el emacs.1 european.el idlwave.el reftex-vars.el reftex.el reftex.texi slovak.el supercite.el .cvsignore advice.el calc-forms.el calc-sel.el calendar.el - china-util.el cl-macs.el cl.texi complete.el and 44 other files + china-util.el cl-macs.el cl.texi and 44 other files Wes Hardaker: changed gnus-score.el gnus-art.el gnus-sum.el gnus-win.el @@ -2695,8 +2745,8 @@ William F. Mann: wrote perl-mode.el William F. Schelter: wrote telnet.el -William M. Perry: wrote mailcap.el url-dav.el url-gw.el url-http.el - url-util.el url.el vc-dav.el +William M. Perry: wrote mailcap.el socks.el url-dav.el url-gw.el + url-http.el url-util.el url.el vc-dav.el and changed url-handlers.el url-file.el url-methods.el url-vars.el url-https.el aclocal.m4 mule-sysdp.el url-imap.el url-news.el url-nfs.el configure.in image.el mwheel.el url-about.el url-auth.el @@ -2709,6 +2759,8 @@ William Sommerfeld: wrote emacsclient.c emacsserver.c scribe.el server.el Wilson H. Tien: changed unexelf.c +Wilson Snyder: changed verilog-mode.el + Wim Nieuwenhuizen: changed TUTORIAL.nl Wlodzimierz Bzyl: wrote ogonek.el @@ -2735,9 +2787,9 @@ Xavier Maillard: changed gnus-faq.texi gnus-score.el spam.el Yagi Tatsuya: changed gnus-art.el gnus-start.el Yamamoto Mitsuharu: changed macterm.c macfns.c mac-win.el mac.c macterm.h - macmenu.c macgui.h image.c macselect.c keyboard.c xdisp.c makefile.MPW - config.h emacs.c INSTALL Makefile.in macos.texi darwin.h xfaces.c - dispnew.c alloc.c and 77 other files + macmenu.c macgui.h image.c macselect.c xdisp.c keyboard.c emacs.c + makefile.MPW config.h INSTALL Makefile.in macos.texi darwin.h + unexmacosx.c xfaces.c dispnew.c and 79 other files Yann Dirson: changed imenu.el From cf24372d5853f590f705450b909659f5bd4b312e Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Wed, 30 Jan 2008 22:06:11 +0000 Subject: [PATCH 05/12] *** empty log message *** --- lisp/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c512c3cd91c..99ce366cce8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2008-01-30 Nick Roberts + + * progmodes/gdb-ui.el (gdb-var-set-format-regexp): New constant. + (gdb-var-set-format-handler): New function. + (gdb-var-set-format): Use it. + 2008-01-29 Alan Mackenzie * progmodes/cc-langs.el (c-block-stmt-1-kwds, c-block-stmt-2-kwds) From 473a20b83e6e15f021ab1397569dece0d25be98a Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Wed, 30 Jan 2008 22:07:41 +0000 Subject: [PATCH 06/12] (gdb-var-set-format-regexp): New constant. (gdb-var-set-format-handler): New function. (gdb-var-set-format): Use it. --- lisp/progmodes/gdb-ui.el | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el index 4e6727cdbad..a3a40e03574 100644 --- a/lisp/progmodes/gdb-ui.el +++ b/lisp/progmodes/gdb-ui.el @@ -886,13 +886,22 @@ type_changed=\".*?\".*?}") (let* ((var (nth (- (count-lines (point-min) (point)) 2) gdb-var-list)) (varnum (car var))) (gdb-enqueue-input - (list + (list (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba) (concat "server interpreter mi \"-var-set-format " varnum " " format "\"\n") (concat "-var-set-format " varnum " " format "\n")) - 'ignore)) - (gdb-var-update-1))) + `(lambda () (gdb-var-set-format-handler ,varnum)))))) + +(defconst gdb-var-set-format-regexp + "format=\"\\(.*?\\)\",.*value=\"\\(.*?\\)\"") + +(defun gdb-var-set-format-handler (varnum) + (goto-char (point-min)) + (if (re-search-forward gdb-var-set-format-regexp nil t) + (let ((var (assoc varnum gdb-var-list))) + (setcar (nthcdr 4 var) (match-string 2)) + (gdb-var-update-1)))) (defun gdb-var-delete-1 (varnum) (gdb-enqueue-input From a695ae76903021ab273902809611bfdccf0c4eae Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Wed, 30 Jan 2008 23:46:26 +0000 Subject: [PATCH 07/12] Add nt/emacs.manifest --- make-dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/make-dist b/make-dist index b5e7da77ba6..05e3343e1c7 100755 --- a/make-dist +++ b/make-dist @@ -494,7 +494,7 @@ echo "Making links to \`m4'" echo "Making links to \`nt'" (cd nt - ln emacs.rc config.nt [a-z]*.c ../${tempdir}/nt + ln emacs.manifest emacs.rc config.nt [a-z]*.c ../${tempdir}/nt ln nmake.defs gmake.defs subdirs.el ../${tempdir}/nt ln [a-z]*.bat [a-z]*.h ../${tempdir}/nt ln ChangeLog INSTALL README makefile.w32-in ../${tempdir}/nt) From 892df15e09a4486bf0842166a860582e1fcde9d7 Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Thu, 31 Jan 2008 01:31:36 +0000 Subject: [PATCH 08/12] Add copyright notice and license. --- admin/nt/README-UNDUMP.W32 | 22 ++++++++++++++++++++++ admin/nt/README-ftp-server | 24 +++++++++++++++++++++++- admin/nt/README.W32 | 22 ++++++++++++++++++++++ 3 files changed, 67 insertions(+), 1 deletion(-) diff --git a/admin/nt/README-UNDUMP.W32 b/admin/nt/README-UNDUMP.W32 index 9c9875b44d4..e1634448be1 100644 --- a/admin/nt/README-UNDUMP.W32 +++ b/admin/nt/README-UNDUMP.W32 @@ -1,3 +1,7 @@ +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Free Software Foundation, Inc. +See the end of the file for license conditions. + Emacs for Windows This README file describes how to dump a bare precompiled version of GNU @@ -34,3 +38,21 @@ problems with Emacs, including problems with dumping, send email to "help-emacs-windows@gnu.org". Enjoy! + + +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 3, 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. diff --git a/admin/nt/README-ftp-server b/admin/nt/README-ftp-server index a15788f5714..13b7c2a4b4e 100644 --- a/admin/nt/README-ftp-server +++ b/admin/nt/README-ftp-server @@ -1,3 +1,7 @@ +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Free Software Foundation, Inc. +See the end of the file for license conditions. + Precompiled Distributions of Emacs for Windows @@ -264,4 +268,22 @@ (jasonr@gnu.org) Most of this README was contributed by former maintainer Andrew Innes - (andrewi@gnu.org) \ No newline at end of file + (andrewi@gnu.org) + + +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 3, 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. diff --git a/admin/nt/README.W32 b/admin/nt/README.W32 index 4c74f12f96c..9d78e4f5e89 100644 --- a/admin/nt/README.W32 +++ b/admin/nt/README.W32 @@ -1,3 +1,7 @@ +Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 + Free Software Foundation, Inc. +See the end of the file for license conditions. + Emacs for Windows This README file describes how to set up and run a precompiled version @@ -211,3 +215,21 @@ c-submit-bug-report for C/C++/Java mode, etc. Enjoy! + + +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 3, 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. From 72000816ad927589466ab55f166a85c7803e2cce Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Thu, 31 Jan 2008 01:40:20 +0000 Subject: [PATCH 09/12] (image-library-alist): Prefer libxpm.dll. --- lisp/ChangeLog | 4 ++++ lisp/term/w32-win.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 99ce366cce8..faf342f7372 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2008-01-31 Jason Rumney + + * term/w32-win.el (image-library-alist): Prefer libxpm.dll. + 2008-01-30 Nick Roberts * progmodes/gdb-ui.el (gdb-var-set-format-regexp): New constant. diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el index 16edd55f5a4..d9a87e35079 100644 --- a/lisp/term/w32-win.el +++ b/lisp/term/w32-win.el @@ -1253,7 +1253,7 @@ pop-up menu are unaffected by `w32-list-proportional-fonts')." ;;; Set default known names for image libraries (setq image-library-alist - '((xpm "xpm4.dll" "libXpm-nox4.dll" "libxpm.dll") + '((xpm "libxpm.dll" "xpm4.dll" "libXpm-nox4.dll") (png "libpng13d.dll" "libpng13.dll" "libpng12d.dll" "libpng12.dll" "libpng.dll") (jpeg "jpeg62.dll" "libjpeg.dll" "jpeg-62.dll" "jpeg.dll") (tiff "libtiff3.dll" "libtiff.dll") From a32aad64df910afb931443178a6093b940477f2c Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Thu, 31 Jan 2008 06:42:01 +0000 Subject: [PATCH 10/12] (make_ctrl_char): If C is a multibyte character, just return it ORed with ctrl_modifier. --- src/ChangeLog | 5 +++++ src/keyboard.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index eac48d83fbb..bef208cc3f9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2008-01-31 Kenichi Handa + + * keyboard.c (make_ctrl_char): If C is a multibyte character, just + return it ORed with ctrl_modifier. + 2008-01-26 Thien-Thi Nguyen * fns.c (Fclrhash): Return TABLE. diff --git a/src/keyboard.c b/src/keyboard.c index 097decb66a7..20ecf203324 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -2310,6 +2310,9 @@ make_ctrl_char (c) /* Save the upper bits here. */ int upper = c & ~0177; + if (! ASCII_BYTE_P (c)) + return c |= ctrl_modifier; + c &= 0177; /* Everything in the columns containing the upper-case letters From ace67e7e2d2824ca57039f4ba9c15ef9a2602056 Mon Sep 17 00:00:00 2001 From: Nick Roberts Date: Thu, 31 Jan 2008 08:14:23 +0000 Subject: [PATCH 11/12] *** empty log message *** --- man/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/man/ChangeLog b/man/ChangeLog index 65963d30088..f7b0965b9dd 100644 --- a/man/ChangeLog +++ b/man/ChangeLog @@ -1,3 +1,7 @@ +2008-01-31 Nick Roberts + + * trouble.texi (Checklist): Direct users to emacs-devel@gnu.org. + 2008-01-26 Richard Stallman * maintaining.texi (Tags): Delete redundant index entry. From 01e573290dceccfe5d79cb72abf4a7140226fc3f Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Thu, 31 Jan 2008 10:40:14 +0000 Subject: [PATCH 12/12] (rmail-highlight): Fix specification. --- lisp/ChangeLog | 5 +++++ lisp/mail/rmail.el | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index faf342f7372..ed8eb06550b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-01-31 Martin Rudalics + + * mail/rmail.el (rmail-highlight): Fix specification. + Reported by: pod . + 2008-01-31 Jason Rumney * term/w32-win.el (image-library-alist): Prefer libxpm.dll. diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index e9cfc7d4216..b3a234a6210 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -327,7 +327,7 @@ See also `rmail-highlight-face'." :group 'rmail-headers) (defface rmail-highlight - '((t :default highlight)) + '((t (:inherit highlight))) "Face to use for highlighting the most important header fields." :group 'rmail-headers :version "22.1")