Commit ba46f4d8 authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from mainline.

parents d9d0d182 0dc3e410
2011-02-26 Eli Zaretskii <eliz@gnu.org>
* .bzrignore: Ignore new lib/*.in-h files.
* config.bat: Rename stdint.in.h and sys_stat.in.h. Call
depfiles.bat even if lib/deps already exist.
2011-02-25 Paul Eggert <eggert@cs.ucla.edu>
Simplify symlink portability workaround.
......@@ -7,7 +14,8 @@
* lib/dosname.h: New file, regenerated from gnulib.
* configure, lib/Makefile.in, lib/getopt_int.h, lib/gnulib.mk:
* lib/stdlib.in.h, m4/stdlib_h.m4: Regenerate.
* lib/stdlib.in.h, m4/stdlib_h.m4: Regenerate to incorporate
recent changes to configure.in and to gnulib.
2011-02-24 Glenn Morris <rgm@gnu.org>
......@@ -7643,7 +7651,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,
......@@ -8984,7 +8992,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)
......
......@@ -9,6 +9,10 @@ before bootstrapping:
$ ./configure
(Normally there is no need to run `autoconf' etc. If you do need it,
the relevant command is `autoreconf -I m4'. Be aware that this will
likely lead to conflicts next time you update from Bazaar.)
Some of the files that are included in the Emacs tarball, such as
byte-compiled Lisp files, are not stored in Bazaar. Therefore, to
build from Bazaar you must run "make bootstrap" instead of just "make":
......
......@@ -81,6 +81,8 @@ this in the same commit as making new entries. Using this plugin
will merge ALL changed entries (including older ones) to the top of
the destination file.
Maybe the default Emacs behavior without this plugin is better, I dunno.
1) Get clean, up-to-date copies of the emacs-23 and trunk branches.
Check for any uncommitted changes with bzr status.
......
......@@ -280,17 +280,20 @@ cd lib
Rem Rename files like djtar on plain DOS filesystem would.
If Exist c++defs.h update c++defs.h cxxdefs.h
If Exist getopt.in.h update getopt.in.h getopt.in-h
If Exist stddef.in.h update stddef.in.h stddef.in-h
If Exist stdbool.in.h update stdbool.in.h stdbool.in-h
If Exist stddef.in.h update stddef.in.h stddef.in-h
If Exist stdint.in.h update stdint.in.h stdint.in-h
If Exist stdlib.in.h update stdlib.in.h stdlib.in-h
If Exist sys_stat.in.h update sys_stat.in.h sys_stat.in-h
If Exist time.in.h update time.in.h time.in-h
If Exist unistd.in.h update unistd.in.h unistd.in-h
sed -f ../msdos/sedlibcf.inp < Makefile.in > makefile.tmp
sed -f ../msdos/sedlibmk.inp < makefile.tmp > Makefile
rm -f makefile.tmp
Rem Create .Po files for new files in lib/
If Not Exist deps\stamp mkdir deps
If Not Exist deps\stamp for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f
If Not Exist deps\stamp echo deps-stamp > deps\stamp
for %%f in (*.c) do @call ..\msdos\depfiles.bat %%f
echo deps-stamp > deps\stamp
cd ..
rem ----------------------------------------------------------------------
Echo Configuring the lisp directory...
......
2011-03-01 Christoph Scholtes <cschol2112@googlemail.com>
* maintaining.texi (Format of ChangeLog): Add reference to
add-log-full-name.
(Change Log Commands): Add documentation for combining multiple
symbols in one change.
2011-03-01 Glenn Morris <rgm@gnu.org>
* custom.texi (Directory Variables):
Give an example of excluding subdirectories.
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.
......
......@@ -1331,7 +1331,8 @@ corresponding alist applies to all the files in that subdirectory.
(tab-width . 4)
(fill-column . 80)))
(c-mode . ((c-file-style . "BSD")))
(java-mode . ((c-file-style . "BSD")))
(java-mode . ((c-file-style . "BSD")
(subdirs . nil)))
("src/imported"
. ((nil . ((change-log-default-name . "ChangeLog.local"))))))
@end example
......@@ -1340,8 +1341,10 @@ corresponding alist applies to all the files in that subdirectory.
This example shows some settings for a hypothetical project. It sets
@samp{indent-tabs-mode}, @code{tab-width}, and @code{fill-column} for
any file in the project's directory tree, and it sets the indentation
style for any C or Java source file. Finally, it specifies a different
@file{ChangeLog} file name for any file in the @file{src/imported}
style for any C or Java source file. The special @code{subdirs} element
indicates that the Java mode settings are only to be applied in the
current directory, not in any subdirectories. Finally, it specifies a
different @file{ChangeLog} file name for any file in the @file{src/imported}
subdirectory of the directory where you put the @file{.dir-locals.el}
file.
......
......@@ -1486,6 +1486,10 @@ changed.
non-@code{nil}, @kbd{C-x 4 a} adds to any existing item for the file
rather than starting a new item.
You can combine multiple changes of the same nature. If you don't
enter any text after the initial @kbd{C-x 4 a}, any subsequent
@kbd{C-x 4 a} adds another symbol to the change.
@vindex add-log-always-start-new-record
If @code{add-log-always-start-new-record} is non-@code{nil},
@kbd{C-x 4 a} always makes a new entry, even if the last entry
......@@ -1535,13 +1539,14 @@ insert a VC log entry into a Change Log buffer by typing @kbd{C-x v a}
@node Format of ChangeLog
@subsection Format of ChangeLog
A change log entry starts with a header line that contains the current
date, your name, and your email address (taken from the variable
@code{add-log-mailing-address}). Aside from these header lines, every
line in the change log starts with a space or a tab. The bulk of the
entry consists of @dfn{items}, each of which starts with a line starting
with whitespace and a star. Here are two entries, both dated in May
1993, with two items and one item respectively.
A change log entry starts with a header line that contains the
current date, your name (taken from the variable
@code{add-log-full-name}), and your email address (taken from the
variable @code{add-log-mailing-address}). Aside from these header
lines, every line in the change log starts with a space or a tab. The
bulk of the entry consists of @dfn{items}, each of which starts with a
line starting with whitespace and a star. Here are two entries, both
dated in May 1993, with two items and one item respectively.
@iftex
@medbreak
......
......@@ -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-03-01 Glenn Morris <rgm@gnu.org>
* variables.texi (Directory Local Variables):
Mention `(subdirs . nil)' alist element.
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
minibuffer history lists (Bug#8085).
2011-02-19 Eli Zaretskii <eliz@gnu.org>
* elisp.texi: Sync @dircategory with ../../info/dir.
......
......@@ -433,18 +433,17 @@ expression, thus moving point forward one word.
@cindex minibuffer history
@cindex history list
A @dfn{minibuffer history list} records previous minibuffer inputs so
the user can reuse them conveniently. A history list is actually a
symbol, not a list; it is a variable whose value is a list of strings
(previous inputs), most recent first.
There are many separate history lists, used for different kinds of
inputs. It's the Lisp programmer's job to specify the right history
list for each use of the minibuffer.
You specify the history list with the optional @var{hist} argument
to either @code{read-from-minibuffer} or @code{completing-read}. Here
are the possible values for it:
A @dfn{minibuffer history list} records previous minibuffer inputs
so the user can reuse them conveniently. It is a variable whose value
is a list of strings (previous inputs), most recent first.
There are many separate minibuffer history lists, used for different
kinds of inputs. It's the Lisp programmer's job to specify the right
history list for each use of the minibuffer.
You specify a minibuffer history list with the optional @var{hist}
argument to @code{read-from-minibuffer} or @code{completing-read}.
Here are the possible values for it:
@table @asis
@item @var{variable}
......
......@@ -1718,7 +1718,8 @@ directory-local variables. The name of the file is
The MS-DOS version of Emacs uses @file{_dir-locals.el} instead, due to
limitations of the DOS filesystems.
}. A file by that name in a directory causes Emacs to apply its
settings to any file in that directory or any of its subdirectories.
settings to any file in that directory or any of its subdirectories
(optionally, you can exclude subdirectories; see below).
If some of the subdirectories have their own @file{.dir-locals.el}
files, Emacs uses the settings from the deepest file it finds starting
from the file's directory and moving up the directory tree. The file
......@@ -1749,7 +1750,10 @@ file's buffer turns on a mode that is derived from @var{major-mode},
then the all the variables in the associated @var{alist} are applied;
@var{alist} should be of the form @code{(@var{name} . @var{value})}.
A special value @code{nil} for @var{major-mode} means the settings are
applicable to any mode.
applicable to any mode. In @var{alist}, you can use a special
@var{name}: @code{subdirs}. If the associated value is
@code{nil}, the alist is only applied to files in the relevant
directory, not to those in any subdirectories.
With the second form of @var{variables}, if @var{directory} is the
initial substring of the file's directory, then @var{list} is applied
......@@ -1757,12 +1761,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 +1783,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 Michael Albinus <michael.albinus@gmx.de>
* tramp.texi (Frequently Asked Questions): Add Emacs 24 to
supported systems.
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
......
No preview for this file type
......@@ -353,6 +353,11 @@ Just set shell-dir-cookie-re to an appropriate regexp.
will turn on `whitespace-mode' for *vc-diff* buffers. Modes should
call `hack-dir-local-variables-non-file-buffer' to support this.
+++
** You can prevent directory local variables from applying to subdirectories.
Add an element (subdirs . nil) to the alist portion of any variables
settings to indicate said section should not be applied to subdirectories.
** ERC changes
*** New vars `erc-autojoin-timing' and `erc-autojoin-delay'.
......@@ -386,6 +391,8 @@ You can get a comparable behavior with:
** Calendar, Diary, and Appt
*** New function `diary-hebrew-birthday'.
---
*** The obsolete (since Emacs 22.1) method of enabling the appt package
by adding appt-make-list to diary-hook has been removed. Use appt-activate.
......
......@@ -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>
......
;;; ja-dic.el --- dictionary for Japanese input method -*-coding: euc-japan; byte-compile-disable-print-circle:t; -*-
;;; ja-dic.el --- dictionary for Japanese input method -*-coding: euc-japan; -*-
;; Generated by the command `skkdic-convert'
;; Date: Tue Feb 16 15:59:19 2010
;; Date: Sat Feb 26 10:26:11 2011
;; Original SKK dictionary file: ../SKK-DIC/SKK-JISYO.L
 
;; This file is part of GNU Emacs.
......@@ -16984,7 +16984,6 @@
 
;; Setting okuri-nasi entries.
(skkdic-set-okuri-nasi
"をんな 女"
"ー 〜"
"あ 嗚 明 安 襾 哇 娃 椏 亞 唖 痾 婀 阿 彼 吾 亜"
"あーくとう アーク灯"
......@@ -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
......
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