7:39 a.m.
NOTE: This patch has been committed.
lisp/ChangeLog addition:
2005-11-13 Ben Wing <ben(a)xemacs.org>
* derived.el:
* frame.el (get-frame-for-buffer):
* toolbar.el (press-toolbar-button):
* toolbar.el (release-and-activate-toolbar-button):
* glyphs.el:
* glyphs.el (set-glyph-property):
* glyphs.el (set-glyph-image):
* glyphs.el (set-glyph-contrib-p):
* glyphs.el (set-glyph-baseline):
* hyper-apropos.el (hyper-apropos-map):
* mouse.el (mouse-track-down-hook):
* files.el (file-name-extension):
* specifier.el:
* specifier.el (map-specifier):
* specifier.el (set-specifier):
Fix uses of `foo'; change 'foo -> `foo', and put punctuation outside
of quotes.
Add comments in specifier.el about needing better and new convenience
functions.
build source patch:
Diff command: bash -ci "cvs-diff --show-c-function -no-changelog "
Files affected: lisp/files.el lisp/mouse.el lisp/hyper-apropos.el lisp/specifier.el
lisp/glyphs.el lisp/toolbar.el lisp/frame.el lisp/derived.el
Index: lisp/derived.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/derived.el,v
retrieving revision 1.10
diff -u -p -r1.10 derived.el
--- lisp/derived.el 2004/06/18 15:48:38 1.10
+++ lisp/derived.el 2005/11/13 07:36:22
＠＠ -59,11 +59,11 ＠＠
;; (define-key hypertext-mode-map [down-mouse-3] 'do-hyper-link)
;;
;; will create a function `hypertext-mode' with its own (sparse)
-;; keymap `hypertext-mode-map.' The command M-x hypertext-mode will
+;; keymap `hypertext-mode-map'. The command M-x hypertext-mode will
;; perform the following actions:
;;
;; - run the command (text-mode) to get its default setup
-;; - replace the current keymap with 'hypertext-mode-map,' which will
+;; - replace the current keymap with 'hypertext-mode-map', which will
;; inherit from 'text-mode-map'.
;; - replace the current syntax table with
;; 'hypertext-mode-syntax-table', which will borrow its defaults
＠＠ -77,7 +77,7 ＠＠
;; set the local variable `case-fold-search' to nil.
;;
;; The advantages of this system are threefold. First, text mode is
-;; untouched -- if you had added the new keystroke to `text-mode-map,'
+;; untouched -- if you had added the new keystroke to `text-mode-map',
;; possibly using hooks, you would have added it to all text buffers
;; -- here, it appears only in hypertext buffers, where it makes
;; sense. Second, it is possible to build even further, and make
Index: lisp/frame.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/frame.el,v
retrieving revision 1.24
diff -u -p -r1.24 frame.el
--- lisp/frame.el 2005/01/28 02:58:40 1.24
+++ lisp/frame.el 2005/11/13 07:36:24
＠＠ -1774,16 +1774,16 ＠＠ This is a subroutine of `get-frame-for-b
shrink-to-fit)
"Select and return a frame in which to display BUFFER.
Normally, the buffer will simply be displayed in the selected frame.
-But if the symbol naming the major-mode of the buffer has a 'frame-name
+But if the symbol naming the major-mode of the buffer has a `frame-name'
property (which should be a symbol), then the buffer will be displayed in
a frame of that name. If there is no frame of that name, then one is
created.
-If the major-mode doesn't have a 'frame-name property, then the frame
+If the major-mode doesn't have a `frame-name' property, then the frame
named by `get-frame-for-buffer-default-frame-name' will be used. If
that is nil (the default) then the currently selected frame will used.
-If the frame-name symbol has an 'instance-limit property (an integer)
+If the frame-name symbol has an `instance-limit' property (an integer)
then each time a buffer of the mode in question is displayed, a new frame
with that name will be created, until there are `instance-limit' of them.
If instance-limit is 0, then a new frame will be created each time.
＠＠ -1791,7 +1791,7 ＠＠ If instance-limit is 0, then a new frame
If a buffer is already displayed in a frame, then `instance-limit' is
ignored, and that frame is used.
-If the frame-name symbol has a 'frame-defaults property, then that is
+If the frame-name symbol has a `frame-defaults' property, then that is
prepended to the `default-frame-plist' when creating a frame for the
first time.
Index: lisp/toolbar.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/toolbar.el,v
retrieving revision 1.15
diff -u -p -r1.15 toolbar.el
--- lisp/toolbar.el 2002/03/13 08:52:09 1.15
+++ lisp/toolbar.el 2005/11/13 07:36:26
＠＠ -146,7 +146,7 ＠＠ or through the Options menu."
;;
(defun press-toolbar-button (event)
"Press a toolbar button. This only changes its appearance.
-Call function stored in `toolbar-blank-press-function,' if any, with EVENT as
+Call function stored in `toolbar-blank-press-function', if any, with EVENT as
an argument if press is over a blank area of the toolbar."
(interactive "_e")
(setq this-command last-command)
＠＠ -165,7 +165,7 ＠＠ an argument if press is over a blank are
(defun release-and-activate-toolbar-button (event)
"Release a toolbar button and activate its callback.
-Call function stored in `toolbar-blank-release-function,' if any, with EVENT
+Call function stored in `toolbar-blank-release-function', if any, with EVENT
as an argument if release is over a blank area of the toolbar."
(interactive "_e")
(or (button-release-event-p event)
Index: lisp/glyphs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/glyphs.el,v
retrieving revision 1.8
diff -u -p -r1.8 glyphs.el
--- lisp/glyphs.el 2005/02/22 23:38:50 1.8
+++ lisp/glyphs.el 2005/11/13 07:36:28
＠＠ -584,7 +584,7 ＠＠ If PROPERTY is a built-in property, the
HOW-TO-ADD should be either nil or one of the symbols `prepend',
`append', `remove-tag-set-prepend', `remove-tag-set-append',
`remove-locale',
- `remove-locale-type', or `remove-all.' See `copy-specifier' and
+ `remove-locale-type', or `remove-all'. See `copy-specifier' and
`add-spec-to-specifier' for a description of what each of
these means. Most of the time, you do not need to worry about
this argument; the default behavior usually is fine.
＠＠ -695,7 +695,7 ＠＠ If SPEC is an alist, LOCALE must be omit
specifier object, LOCALE can be a locale, a locale type, `all',
or nil; see `copy-specifier' for its semantics. Otherwise LOCALE
specifies the locale under which the specified instantiator(s)
- will be added, and defaults to `global.'
+ will be added, and defaults to `global'.
See `set-glyph-property' for more information."
; (interactive (glyph-interactive "image"))
＠＠ -733,7 +733,7 ＠＠ If SPEC is an alist, LOCALE must be omit
specifier object, LOCALE can be a locale, a locale type, `all',
or nil; see `copy-specifier' for its semantics. Otherwise LOCALE
specifies the locale under which the specified instantiator(s)
- will be added, and defaults to `global.'
+ will be added, and defaults to `global'.
See `set-glyph-property' for more information."
; (interactive (glyph-interactive "contrib-p"))
＠＠ -772,7 +772,7 ＠＠ If SPEC is an alist, LOCALE must be omit
specifier object, LOCALE can be a locale, a locale type, `all',
or nil; see `copy-specifier' for its semantics. Otherwise LOCALE
specifies the locale under which the specified instantiator(s)
- will be added, and defaults to `global.'
+ will be added, and defaults to `global'.
See `set-glyph-property' for more information."
; (interactive (glyph-interactive "baseline"))
＠＠ -1133,7 +1133,7 ＠＠ If unspecified in a particular domain, `
(set-glyph-image (symbol-value harg) value))))
;; It might or might not be garbage, but it's rude. Make these
-;; `compatible' instead of `obsolete.' -slb
+;; `compatible' instead of `obsolete'. -slb
(defun define-obsolete-pointer-glyph (old new)
(define-compatible-variable-alias old new)
(dontusethis-set-symbol-value-handler
Index: lisp/specifier.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/specifier.el,v
retrieving revision 1.14
diff -u -p -r1.14 specifier.el
--- lisp/specifier.el 2004/09/22 02:05:51 1.14
+++ lisp/specifier.el 2005/11/13 07:36:30
＠＠ -1,7 +1,7 ＠＠
;;; specifier.el --- Lisp interface to specifiers
;; Copyright (C) 1997 Free Software Foundation, Inc.
-;; Copyright (C) 1995, 1996, 2000, 2002 Ben Wing.
+;; Copyright (C) 1995, 1996, 2000, 2002, 2005 Ben Wing.
;; Author: Ben Wing <ben(a)xemacs.org>
;; Keywords: internal, dumped
＠＠ -55,7 +55,7 ＠＠ Optional DONT-CANONICALIZE, if non-nil,
If optional MS-LOCALE is a locale, MS-FUNC will be called for that locale.
If MS-LOCALE is a locale type, MS-FUNC will be mapped over all locales of that
-type. If MS-LOCALE is 'all or nil, MS-FUNC will be mapped over all locales in
+type. If MS-LOCALE is `all' or nil, MS-FUNC will be mapped over all locales in
MS-SPECIFIER.
Optional MS-TAG-SET and MS-EXACT-P are as in `specifier-spec-list'.
＠＠ -306,7 +306,7 ＠＠ otherwise return t."
VALUE may be any of the values accepted by `canonicalize-spec-list', including
-- an instantiator (either a Lisp object which will be returned when the
- specifier is instanced, or a Lisp object that can be instantiated to
+ specifier is instantiated, or a Lisp object that can be instantiated to
produce an opaque value: eg, a font name (string) can be used for a font
specifier, but an instance will be a font object)
-- a list of instantiators
＠＠ -330,7 +330,7 ＠＠ that function.
Note that a VALUE of `nil' is either illegal or will be treated as a value of
`nil'; it does not remove existing specifications. Use `remove-specifier' for
that. N.B. `remove-specifier' defaults to removing all specifications, not
-just the 'global one!
+just the `global' one!
Warning: this function is inherently heuristic, and should not be relied on to
properly resolve ambiguities, when specifier instantiators can be lists
＠＠ -410,6 +410,12 ＠＠ in such a way as to avoid any such ambig
(canonicalize-spec-list nval (specifier-type specifier))
how-to-add))))
value)
+
+;; #### Misnamed and wrong behavior. Should operate on INSTANTIATORS, not
+;; instances. Need to come up with clean and general functions for
+;; modifying a specifier. New `specifier-instantiator' may help.
+;; #### Also need `instantiator-to-instance', a convenient version of
+;; `specifier-instance-from-inst-list'.
(defun modify-specifier-instances (specifier func &optional args force default
locale tag-set)
Index: lisp/hyper-apropos.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/hyper-apropos.el,v
retrieving revision 1.15
diff -u -p -r1.15 hyper-apropos.el
--- lisp/hyper-apropos.el 2004/09/15 08:30:27 1.15
+++ lisp/hyper-apropos.el 2005/11/13 07:36:31
＠＠ -208,7 +208,7 ＠＠ you can get the full output by using \\[
(define-key map "e" 'hyper-apropos-eliminate-keyword)
map)
"Keybindings for the *Hyper Apropos* buffer.
-This map inherits from `hyper-apropos-help-map.'")
+This map inherits from `hyper-apropos-help-map'.")
(define-obsolete-variable-alias
'hypropos-map 'hyper-apropos-map)
Index: lisp/mouse.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mouse.el,v
retrieving revision 1.31
diff -u -p -r1.31 mouse.el
--- lisp/mouse.el 2005/01/26 04:47:14 1.31
+++ lisp/mouse.el 2005/11/13 07:36:33
＠＠ -406,7 +406,7 ＠＠ If any function returns non-nil, the rem
called.
Note that most applications should take action when the mouse is
-released, not when it is pressed.'")
+released, not when it is pressed.")
(defvar mouse-track-drag-hook nil
"Function or functions called when the user drags the mouse.
Index: lisp/files.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/files.el,v
retrieving revision 1.74
diff -u -p -r1.74 files.el
--- lisp/files.el 2005/04/08 14:07:00 1.74
+++ lisp/files.el 2005/11/13 07:36:36
＠＠ -2478,7 +2478,7 ＠＠ The extension, in a file name, is the pa
"Return FILENAME's final \"extension\".
The extension, in a file name, is the part that follows the last `.'.
Return nil for extensionless file names such as `foo'.
-Return the empty string for file names such as `foo.'.
+Return the empty string for file names such as `foo'.
If PERIOD is non-nil, then the returned value includes the period
that delimits the extension, and if FILENAME has no extension,