Commit 2b0c7330 authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.

parents df7f0d0b d1f61aaf
......@@ -7634,7 +7634,7 @@
* Makefile.in (lib-src/Makefile, src/Makefile, oldXMenu/Makefile):
Depend on vpath.sed.
Replace sed comand for VPATH with @vpath_sed@.
Replace sed command for VPATH with @vpath_sed@.
* configure.in: Substitute variable `vpath_sed'.
If not in $srcdir and $srcdir is configured,
......@@ -8975,7 +8975,7 @@
there, and then copy it in, to make sure we get a real file.
* make-dist: Don't try to distribute *.defns files any more. The
only such file was for simula.el, which has been superceded by a
only such file was for simula.el, which has been superseded by a
version which doesn't have a separate .defns file.
1992-05-28 Ken Raeburn (Raeburn@Cygnus.COM)
......
2011-02-28 Eli Zaretskii <eliz@gnu.org>
* search.texi (Regexp Search): Move index entries about regexps to the
"Regexps" node. Add index entries for regexp search. (Bug#8096)
2011-02-19 Glenn Morris <rgm@gnu.org>
* dired.texi (Dired): Dired-X version number was dropped.
......
......@@ -468,8 +468,8 @@ apply to the lazy highlight, which always matches whole words.
@node Regexp Search
@section Regular Expression Search
@cindex regular expression
@cindex regexp
@cindex regexp search
@cindex search for a regular expression
A @dfn{regular expression} (or @dfn{regexp} for short) is a pattern
that denotes a class of alternative strings to match. GNU Emacs
......@@ -543,6 +543,8 @@ Search}.
@node Regexps
@section Syntax of Regular Expressions
@cindex syntax of regexps
@cindex regular expression
@cindex regexp
This manual describes regular expression features that users
typically use. @xref{Regular Expressions,,, elisp, The Emacs Lisp
......
2011-02-28 Glenn Morris <rgm@gnu.org>
* variables.texi (Directory Local Variables): Mention the optional
mtime argument of dir-locals-set-directory-class. (Bug#3577)
2011-02-27 Chong Yidong <cyd@stupidchicken.com>
* minibuf.texi (Minibuffer History): Clarify discussion of
......
......@@ -1757,12 +1757,19 @@ recursively by following the above rules; @var{list} should be of one
of the two forms accepted by this function in @var{variables}.
@end defun
@defun dir-locals-set-directory-class directory class
@defun dir-locals-set-directory-class directory class &optional mtime
This function assigns @var{class} to all the files in @code{directory}
and its subdirectories. Thereafter, all the variable settings
specified for @var{class} will be applied to any visited file in
@var{directory} and its children. @var{class} must have been already
defined by @code{dir-locals-set-class-variables}
defined by @code{dir-locals-set-class-variables}.
Emacs uses this function internally when it loads directory variables
from a @code{.dir-locals.el} file. In that case, the optional
argument @var{mtime} holds the file modification time (as returned by
@code{file-attributes}). Emacs uses this time to check stored
local variables are still valid. If you are assigning a class
directly, not via a file, this argument should be @code{nil}.
@end defun
@defvar dir-locals-class-alist
......@@ -1772,8 +1779,9 @@ settings. It is updated by @code{dir-locals-set-class-variables}.
@defvar dir-locals-directory-cache
This alist holds directory names, their assigned class names, and
modification times of the associated directory local variables file.
It is updated by @code{dir-locals-set-directory-class}.
modification times of the associated directory local variables file
(if there is one). The function @code{dir-locals-set-directory-class}
updates this list.
@end defvar
@node Frame-Local Variables
......
2011-02-28 Glenn Morris <rgm@gnu.org>
* dbus.texi (Type Conversion): Grammar fix.
2011-02-23 Michael Albinus <michael.albinus@gmx.de>
* tramp.texi: Use consistently "Emacs" (instead of "GNU Emacs") and
......
......@@ -893,10 +893,10 @@ applied, when the corresponding D-Bus message is created:
@end example
Other Lisp objects, like symbols or hash tables, are not accepted as
input parameter.
input parameters.
If it is necessary to use another D-Bus type, a corresponding type
symbol can be preceeded to the corresponding Lisp object. Basic D-Bus
symbol can be prepended to the corresponding Lisp object. Basic D-Bus
types are represented by the type symbols @code{:byte},
@code{:boolean}, @code{:int16}, @code{:uint16}, @code{:int32},
@code{:uint32}, @code{:int64}, @code{:uint64}, @code{:double},
......
......@@ -64,7 +64,7 @@ developing GNU and promoting software freedom.''
@macro obsolete{old,new}
@sp 1
@strong{Compatibility}:
@code{\new\} introduced in @semantic{} version 2.0 supercedes
@code{\new\} introduced in @semantic{} version 2.0 supersedes
@code{\old\} which is now obsolete.
@end macro
......
......@@ -1746,7 +1746,7 @@ directories in which `ffap-rfc' will first search for RFCs.
*** hide-ifdef-mode allows shadowing ifdef-blocks instead of hiding them.
See option `hide-ifdef-shadow' and function `hide-ifdef-toggle-shadowing'.
*** `icomplete-prospects-height' now supercedes `icomplete-prospects-length'.
*** `icomplete-prospects-height' now supersedes `icomplete-prospects-length'.
*** Info displays breadcrumbs in the header of the page.
See Info-breadcrumbs-depth to control it.
......
2011-02-28 Juanma Barranquero <lekktu@gmail.com>
* quail/ethiopic.el ("ethiopic"): Fix tpo in docstring.
2011-01-28 Paul Eggert <eggert@cs.ucla.edu>
Redo spelling of Makefile variables to conform to POSIX.
......@@ -27,8 +31,8 @@
2010-08-28 Kenichi Handa <handa@m17n.org>
* quail/japanese.el (quail-japanese-update-translation): Fix
handling of invalid key.
* quail/japanese.el (quail-japanese-update-translation):
Fix handling of invalid key.
2010-08-15 Andreas Schwab <schwab@linux-m68k.org>
......@@ -46,8 +50,7 @@
2010-08-13 Kenichi Handa <handa@m17n.org>
* quail/greek.el ("greek-postfix"): Add rules for Greek style
quotes.
* quail/greek.el ("greek-postfix"): Add rules for Greek style quotes.
2010-08-09 Kenichi Handa <handa@m17n.org>
......
......@@ -39,7 +39,7 @@
;; This was `cyrillic-jcuken'. Alexander Mikhailian
;; <mikhailian@altern.org> says: "cyrillic-jcuken" is actually
;; russian. It is ok but a bit outdated. This layout has been used
;; in typewriters for ages but it has been superceeded on desktops by
;; in typewriters for ages but it has been superseded on desktops by
;; a variation of this layout, implemented in M$ Windows software.
;; The Windows layout is greatly preferred because of the comma and
;; period being placed more conviniently and, of course, because of
......
......@@ -62,7 +62,7 @@ S-SPC or `M-x ethio-insert-ethio-space'
C-' or `M-x ethio-gemination'
Compose the character before the point with the Ethiopic gemination mark.
If the characater is already composed, decompose it and remove the
If the character is already composed, decompose it and remove the
gemination mark."
;; The following keys should work as defined in lisp/language/ethio-util,
......
2011-02-28 Eli Zaretskii <eliz@gnu.org>
* international/mule-cmds.el (set-default-coding-systems): Use the
-unix variant of encoding in default-keyboard-coding-system.
(Bug#8122)
2011-02-27 Chong Yidong <cyd@stupidchicken.com>
 
* facemenu.el (list-colors-display): Use with-help-window (Bug#8048).
......@@ -4670,7 +4676,7 @@
 
2010-10-24 Michael McNamara <mac@mail.brushroad.com>
 
* verilog-mode.el (verilog-directive-re): Make this variable
* progmodes/verilog-mode.el (verilog-directive-re): Make this variable
auto-built for efficiency of execution and updating.
(verilog-extended-complete-re): Support 'pure' fucntion & task
declarations (these have no bodies).
......@@ -4704,7 +4710,7 @@
 
2010-10-24 Wilson Snyder <wsnyder@wsnyder.org>
 
* verilog-mode.el (verilog-auto-inst, verilog-gate-ios)
* progmodes/verilog-mode.el (verilog-auto-inst, verilog-gate-ios)
(verilog-gate-keywords, verilog-read-sub-decls)
(verilog-read-sub-decls-gate, verilog-read-sub-decls-gate-ios)
(verilog-read-sub-decls-line, verilog-read-sub-decls-sig): Support
......
......@@ -20591,7 +20591,7 @@
 
* viper-cmd.el (viper-change-state): Got rid of make-local-hook.
(viper-special-read-and-insert-char): Make C-m work right in the r
comand.
command.
(viper-buffer-search-enable): Fixed format string.
 
* viper-ex.el (ex-token-alist): Use ex-set-visited-file-name
......
......@@ -11678,7 +11678,7 @@
make underlining work for wide characters.
(org-goto-map, org-agenda-mode-map, org-mode-map): Explicitly bind
TAB to `org-cycle', to make sure that no binding in
`outline-mode-map' can supercede it.
`outline-mode-map' can supersede it.
 
2006-03-14 Ken Manheimer <ken.manheimer@gmail.com>
 
......@@ -19139,7 +19139,7 @@
* pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to
pgg-decrypt-region.
(pgg-pending-timers): A new hash for tracking the passphrase cache
timers, so that new ones supercede old ones.
timers, so that new ones supersede old ones.
(pgg-add-passphrase-to-cache): Rename from
`pgg-add-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when new ones are added.
......@@ -19225,7 +19225,7 @@
* pgg.el (pgg-decrypt): Passing along PASSPHRASE in call to
pgg-decrypt-region.
(pgg-pending-timers): A new hash for tracking the passphrase cache
timers, so that new ones supercede old ones.
timers, so that new ones supersede old ones.
(pgg-add-passphrase-to-cache): Rename from
`pgg-add-passphrase-cache' to reduce confusion (all callers
changed). Modified to cancel old timers when new ones are added.
......@@ -4906,7 +4906,7 @@
* two-column.el: Doc fixes.
* loaddefs.el (function-keymap): Definition deleted; this has been
superceded by function-key-map.
superseded by function-key-map.
* gomoku.el (gomoku-mode-map): Use function key symbols, instead
of the keypad.el facilities.
......@@ -6056,7 +6056,7 @@
and `fill-column'. Code now actually sets `left-margin' and
`fill-column', as advertised.
* text-mode.el (change-log-mode): Function deleted, since it's
been superceded by the one in add-log.el.
been superseded by the one in add-log.el.
1992-06-14 Richard Stallman (rms@mole.gnu.ai.mit.edu)
......@@ -6070,7 +6070,7 @@
1992-06-12 Jim Blandy (jimb@pogo.cs.oberlin.edu)
* isearch-mode.el: New package, which will probably supercede
* isearch-mode.el: New package, which will probably supersede
isearch.el.
(isearch-mode-map, isearch-mode-meta-map): When initializing
these, remember that vectors are no longer keymaps.
......@@ -10009,7 +10009,7 @@
display-time-string.
(rmail-pop-up): Default display-time-hook to automatically retrieve
new mail if the variable rmail-pop-up is non-nil.
(add-clock-handler): Removed; superceded by timer.el.
(add-clock-handler): Removed; superseded by timer.el.
* loaddefs.el: Removed add-clock-handler.
......@@ -10032,7 +10032,7 @@
* loaddefs.el: Autoload for diff.
* files.el (diff): Superceded by diff.el.
* files.el (diff): Superseded by diff.el.
(diff-switches-function): Still needs to be merged into diff.el.
* diff.el: New file.
......
......@@ -339,7 +339,7 @@ The types of elements in the layout specification are:
-- positive numbers open to the relative depth indicated by the
number, but do not force already opened subtopics to be closed.
-- 0 means to close topic -- hide all subitems.
: -- repeat spec -- apply the preceeding element to all siblings at
: -- repeat spec -- apply the preceding element to all siblings at
current level, *up to* those siblings that would be covered by specs
following the `:' on the list. Ie, apply to all topics at level but
trailing ones accounted for by trailing specs. (Only the first of
......@@ -3125,7 +3125,7 @@ situation."
nil)
;; rationale: if any intervening items were at a lower depth, we
;; would now be on the first offspring at the target depth -- ie,
;; the preceeding item (per the search direction) must be at a
;; the preceding item (per the search direction) must be at a
;; lesser depth. that's all we need to check.
(if backward (allout-next-heading) (allout-previous-heading))
(if (< allout-recent-depth target-depth)
......@@ -4246,7 +4246,7 @@ With a negative argument, the item is shifted out using
With an argument greater than one, shift-in the item but not its
offspring, making the item into a sibling of its former children,
and a child of sibling that formerly preceeded it.
and a child of sibling that formerly preceded it.
You are not allowed to shift the first offspring of a topic
inwards, because that would yield a \"containment
......@@ -5364,7 +5364,7 @@ header and body. The elements of that list are:
(goto-char start)
(beginning-of-line)
;; Goto initial topic, and register preceeding stuff, if any:
;; Goto initial topic, and register preceding stuff, if any:
(if (> (allout-goto-prefix-doublechecked) start)
;; First topic follows beginning point -- register preliminary stuff:
(setq result
......
......@@ -100,7 +100,7 @@ Usually bound to the dimension of a single symbol or command.")
:type list
:documentation "List of tags defining local text.
This can be nil, or a list where the last element can be a string
representing text that may be incomplete. Preceeding elements
representing text that may be incomplete. Preceding elements
must be semantic tags representing variables or functions
called in a dereference sequence.")
(prefixclass :initarg :prefixclass
......
......@@ -1264,7 +1264,7 @@ inserted into the current context.")
;; generated by a collector. This format is in semanticdb search
;; form. This vaguely standard form is a bit challenging to navigate
;; because the tags do not contain buffer info, but the file associated
;; with the tags preceed the tag in the list.
;; with the tags precedes the tag in the list.
;;
;; Basic displayors don't care, and can strip the results.
;; Advanced highlighting displayors need to know when they need
......
......@@ -426,7 +426,7 @@ See `semantic-edits-change-leaf-tag' for details on parents."
;; confirmed as the lineage of `overlapped-tags'
;; which must have a value by now.
;; Loop over the search list to find the preceeding CDR.
;; Loop over the search list to find the preceding CDR.
;; Fortunatly, (car overlapped-tags) happens to be
;; the first tag positionally.
(let ((tokstart (semantic-tag-start (car overlapped-tags))))
......@@ -874,7 +874,7 @@ pre-positioned to a convenient location."
))
(message "To Remove Middle Tag: (%s)"
(semantic-format-tag-name first)))
;; Find in the cache the preceeding tag
;; Find in the cache the preceding tag
(while (and cachestart (not (eq first (car (cdr cachestart)))))
(setq cachestart (cdr cachestart)))
;; Find the last tag
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment