2002-01-07 Michael Kifer <kifer@cs.stonybrook.edu>
* viper-init.el (viper-cond-compile-for-xemacs-or-emacs):
new macro that replaces viper-emacs-p and viper-xemacs-p in many
cases. Used to reduce the number of warnings.
* viper-cmd.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-standard-value): moved here from viper.el.
(viper-set-unread-command-events): moved to viper-util.el
(viper-check-minibuffer-overlay): make sure
viper-minibuffer-overlay is moved to cover the entire input field.
* viper-util.el: use viper-cond-compile-for-xemacs-or-emacs.
(viper-read-key-sequence, viper-set-unread-command-events,
viper-char-symbol-sequence-p, viper-char-array-p): moved here.
* viper-ex.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-keym.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-mous.el: use viper-cond-compile-for-xemacs-or-emacs.
* viper-macs.el (viper-char-array-p, viper-char-symbol-sequence-p,
viper-event-vector-p): moved to viper-util.el
* viper.el (viper-standard-value): moved to viper-cmd.el.
Use viper-cond-compile-for-xemacs-or-emacs.
* ediff-help.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-hook.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-init.el (ediff-cond-compile-for-xemacs-or-emacs): new
macro designed to be used in many places where ediff-emacs-p or
ediff-xemacs-p was previously used. Reduces the number of
warnings.
Use ediff-cond-compile-for-xemacs-or-emacs in many places in lieue
of ediff-xemacs-p.
(ediff-make-current-diff-overlay, ediff-highlight-diff-in-one-buffer,
ediff-convert-fine-diffs-to-overlays, ediff-empty-diff-region-p,
ediff-whitespace-diff-region-p, ediff-get-region-contents):
moved to ediff-util.el.
(ediff-event-key): moved here.
* ediff-merge.el: got rid of unreferenced variables.
* ediff-mult.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff-util.el: use ediff-cond-compile-for-xemacs-or-emacs.
(ediff-cleanup-mess): improved the way windows are set up after
quitting ediff.
(ediff-janitor): use ediff-dispose-of-variant-according-to-user.
(ediff-dispose-of-variant-according-to-user): new function
designed to be smarter and also understands indirect buffers.
(ediff-highlight-diff-in-one-buffer,
ediff-unhighlight-diff-in-one-buffer,
ediff-unhighlight-diffs-totally-in-one-buffer,
ediff-highlight-diff, ediff-highlight-diff,
ediff-unhighlight-diff, ediff-unhighlight-diffs-totally,
ediff-empty-diff-region-p, ediff-whitespace-diff-region-p,
ediff-get-region-contents, ediff-make-current-diff-overlay):
moved here.
(ediff-format-bindings-of): new function by Hannu Koivisto
<azure@iki.fi>.
(ediff-setup): make sure the merge buffer is always widened and
modifiable.
(ediff-write-merge-buffer-and-maybe-kill): refuse to write the
result of a merge into a file visited by another buffer.
(ediff-arrange-autosave-in-merge-jobs): check if the merge file
is visited by another buffer and ask to save/delete that buffer.
(ediff-verify-file-merge-buffer): new function to do the above.
* ediff-vers.el: load ediff-init.el at compile time.
* ediff-wind.el: use ediff-cond-compile-for-xemacs-or-emacs.
* ediff.el (ediff-windows, ediff-regions-wordwise,
ediff-regions-linewise): use indirect buffers to improve
robustness and make it possible to compare regions of the same
buffer (even overlapping regions).
(ediff-clone-buffer-for-region-comparison,
ediff-clone-buffer-for-window-comparison): new functions.
(ediff-files-internal): refuse to compare identical files.
(ediff-regions-internal): get rid of the warning about comparing
regions of the same buffer.
* ediff-diff.el (ediff-convert-fine-diffs-to-overlays): moved here.
Plus the following fixes courtesy of Dave Love:
Doc fixes.
(ediff-word-1): Use word class and move - to the
front per regexp documentation.
(ediff-wordify): Bind forward-word-function outside loop.
(ediff-copy-to-buffer): Use insert-buffer-substring rather than
consing buffer contents.
(ediff-goto-word): Move syntax table setting outside loop.
;;; cus-start.el --- define customization properties of builtins;;;; Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc.;;;; Author: Per Abrahamsen <abraham@dina.kvl.dk>;; Keywords: internal;; This file is part of GNU Emacs.;; GNU Emacs is free software; you can redistribute it and/or modify;; it under the terms of the GNU General Public License as published by;; the Free Software Foundation; either version 2, or (at your option);; any later version.;; GNU Emacs is distributed in the hope that it will be useful,;; but WITHOUT ANY WARRANTY; without even the implied warranty of;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the;; GNU General Public License for more details.;; You should have received a copy of the GNU General Public License;; along with GNU Emacs; see the file COPYING. If not, write to the;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,;; Boston, MA 02111-1307, USA.;;; Commentary:;;;; This file adds customize support for built-in variables.;; While dumping Emacs, this file is loaded, but it only records;; the standard values; it does not do the rest of the job.;; Later on, if the user makes a customization buffer,;; this file is loaded again with (require 'cus-start);;; then it does the whole job.;;; Code:(let ((all '(;; abbrev.c (abbrev-all-caps abbrev-mode boolean) (pre-abbrev-expand-hook abbrev-mode hook) ;; alloc.c (gc-cons-threshold alloc integer) (undo-limit undo integer) (undo-strong-limit undo integer) (garbage-collection-messages alloc boolean) ;; buffer.c (mode-line-format modeline sexp) ;Hard to do right. (default-major-mode internal function) (enable-multibyte-characters mule boolean) (case-fold-search matching boolean) (fill-column fill integer) (left-margin fill integer) (tab-width editing-basics integer) (ctl-arrow display boolean) (truncate-lines display boolean) (selective-display-ellipses display boolean) (transient-mark-mode editing-basics boolean) (indicate-empty-lines display boolean "21.1") (scroll-up-aggressively windows boolean "21.1") (scroll-down-aggressively windows boolean "21.1") ;; callint.c (mark-even-if-inactive editing-basics boolean) ;; callproc.c (shell-file-name execute file) (exec-path execute (repeat (choice (const :tag "default" nil) (file :format "%v")))) ;; coding.c (inhibit-eol-conversion mule boolean) (eol-mnemonic-undecided mule string) (eol-mnemonic-unix mule string) (eol-mnemonic-dos mule string) (eol-mnemonic-mac mule string) (file-coding-system-alist mule (alist :key-type (regexp :tag "File regexp") :value-type (choice :value (undecided . undecided) (cons :tag "Encoding/decoding pair" :value (undecided . undecided) (coding-system :tag "Decoding") (coding-system :tag "Encoding")) (coding-system :tag "Single coding system" :value undecided) (function :value ignore)))) ;; dired.c (completion-ignored-extensions dired (repeat (string :format "%v"))) ;; dispnew.c (baud-rate display integer) (inverse-video display boolean) (visible-bell display boolean) (no-redraw-on-reenter display boolean) ;; editfns.c (user-full-name mail string) ;; eval.c (max-specpdl-size limits integer) (max-lisp-eval-depth limits integer) (stack-trace-on-error debug (choice (const :tag "off") (repeat :menu-tag "When" :value (nil) (symbol :format "%v")) (const :tag "always" t))) (debug-on-error debug (choice (const :tag "off") (repeat :menu-tag "When" :value (nil) (symbol :format "%v")) (const :tag "always" t))) (debug-ignored-errors debug (repeat (choice symbol regexp))) (debug-on-quit debug (choice (const :tag "off") (repeat :menu-tag "When" :value (nil) (symbol :format "%v")) (const :tag "always" t))) ;; fileio.c (insert-default-directory minibuffer boolean) ;; fns.c (use-dialog-box menu boolean "21.1") ;; frame.c (default-frame-alist frames (repeat (cons :format "%v" (symbol :tag "Parameter") (sexp :tag "Value")))) ;; indent.c (indent-tabs-mode fill boolean) ;; keyboard.c (meta-prefix-char keyboard character) (auto-save-interval auto-save integer) (auto-save-timeout auto-save (choice (const :tag "off" nil) (integer :format "%v"))) (echo-keystrokes minibuffer number) (polling-period keyboard integer) (double-click-time mouse (restricted-sexp :match-alternatives (integerp 'nil 't))) (inhibit-local-menu-bar-menus menu boolean) (help-char keyboard character) (help-event-list keyboard (repeat (sexp :format "%v"))) (menu-prompting menu boolean) (suggest-key-bindings keyboard (choice (const :tag "off" nil) (integer :tag "time" 2) (other :tag "on")));; This is not good news because it will use the wrong;; version-specific directories when you upgrade. We need;; customization of the front of the list, maintaining the standard;; value intact at the back.;;; (load-path environment ;;; (repeat (choice :tag "[Current dir?]";;; :format "%[Current dir?%] %v";;; (const :tag " current dir" nil);;; (directory :format "%v")))) ;; minibuf.c (completion-auto-help minibuffer boolean) (enable-recursive-minibuffers minibuffer boolean) (minibuffer-prompt-properties minibuffer (list (checklist :inline t (const :tag "Read-Only" :doc "Prevent prompt from being modified" :format "%t%n%h" :inline t (read-only t)) (const :tag "Inviolable" :doc "Prevent point from ever entering prompt" :format "%t%n%h" :inline t (point-entered minibuffer-avoid-prompt))) (repeat :inline t :tag "Other Properties" (list :inline t :format "%v" (symbol :tag "Property") (sexp :tag "Value")))) "21.1") (minibuffer-auto-raise minibuffer boolean) ;; options property set at end (read-buffer-function minibuffer (choice (const nil) (function-item iswitchb-read-buffer) function)) ;; msdos.c (dos-unsupported-char-glyph display integer) ;; process.c (delete-exited-processes processes-basics boolean) ;; syntax.c (parse-sexp-ignore-comments editing-basics boolean) (words-include-escapes editing-basics boolean) ;; window.c (temp-buffer-show-function windows (choice (const nil) function)) (display-buffer-function windows (choice (const nil) function)) (pop-up-frames frames boolean) (pop-up-frame-function frames function) (special-display-buffer-names frames (repeat (choice :tag "Buffer" :value "" (string :format "%v") (cons :tag "With attributes" :format "%v" :value ("" . nil) (string :format "%v") (repeat :tag "Attributes" (cons :format "%v" (symbol :tag "Parameter") (sexp :tag "Value"))))))) (special-display-regexps frames (repeat (choice :tag "Buffer" :value "" (regexp :format "%v") (cons :tag "With attributes" :format "%v" :value ("" . nil) (regexp :format "%v") (repeat :tag "Attributes" (cons :format "%v" (symbol :tag "Parameter") (sexp :tag "Value"))))))) (special-display-function frames function) (same-window-buffer-names windows (repeat (string :format "%v"))) (same-window-regexps windows (repeat (regexp :format "%v"))) (pop-up-windows windows boolean) (even-window-heights windows boolean) (next-screen-context-lines windows integer) (split-height-threshold windows integer) (window-min-height windows integer) (window-min-width windows integer) (scroll-preserve-screen-position windows boolean) (display-buffer-reuse-frames windows boolean "21.1") ;; xdisp.c (scroll-step windows integer) (scroll-conservatively windows integer) (scroll-margin windows integer) (truncate-partial-width-windows display boolean) (mode-line-inverse-video modeline boolean) (line-number-display-limit display (choice integer (const :tag "No limit" nil))) (highlight-nonselected-windows display boolean) (message-log-max debug (choice (const :tag "Disable" nil) (integer :menu-tag "lines" :format "%v") (other :tag "Unlimited" t))) (unibyte-display-via-language-environment mule boolean) ;; xfns.c (x-bitmap-file-path installation (repeat (directory :format "%v"))) ;; xterm.c (x-stretch-cursor display boolean "21.1"))) this symbol group type native-p version ;; This function turns a value ;; into an expression which produces that value. (quoter (lambda (sexp) (if (or (memq sexp '(t nil)) (keywordp sexp) (and (listp sexp) (memq (car sexp) '(lambda))) (stringp sexp);; (and (fboundp 'characterp);; (characterp sexp)) (numberp sexp)) sexp (list 'quote sexp))))) (while all (setq this (car all) all (cdr all) symbol (nth 0 this) group (nth 1 this) type (nth 2 this) version (nth 3 this) ;; Don't complain about missing variables which are ;; irrelevant to this platform. native-p (save-match-data (cond ((string-match "\\`dos-" (symbol-name symbol)) (eq system-type 'ms-dos)) ((string-match "\\`w32-" (symbol-name symbol)) (eq system-type 'windows-nt)) (t t)))) (if (not (boundp symbol)) ;; If variables are removed from C code, give an error here! (and native-p (message "Note, built-in variable `%S' not bound" symbol)) ;; Save the standard value, unless we already did. (or (get symbol 'standard-value) (put symbol 'standard-value (list (funcall quoter (default-value symbol))))) ;; If this is NOT while dumping Emacs, ;; set up the rest of the customization info. (unless purify-flag ;; Add it to the right group. (custom-add-to-group group symbol 'custom-variable) ;; Set the type. (put symbol 'custom-type type) (put symbol 'custom-version version)))))(custom-add-to-group 'iswitchb 'read-buffer-function 'custom-variable);; Record cus-start as loaded;; if we have set up all the info that we can set up.;; Don't record cus-start as loaded;; if we have set up only the standard values.(unless purify-flag (provide 'cus-start));;; cus-start.el ends here