Merge from mainline.
This commit is contained in:
Paul Eggert
commit
a3e44e7937
1875 changed files with 1750 additions and 3557 deletions
15
ChangeLog
15
ChangeLog
|
|
@ -1,4 +1,4 @@
|
|||
2011-01-14 Paul Eggert <eggert@cs.ucla.edu>
|
||||
2011-01-17 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr.
|
||||
This avoids building ftoastr and ldtoastr, which aren't needed. See
|
||||
|
|
@ -104,6 +104,14 @@
|
|||
* make-dist: Also put into the distribution aclocal.m4,
|
||||
compile, depcomp, missing, and the files under lib/.
|
||||
|
||||
2011-01-15 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* Makefile.in (epaths-force): No more arch-tag to edit.
|
||||
|
||||
2011-01-15 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* configure.in: Bump min libxml2 version to 2.6.17 (Bug#7603).
|
||||
|
||||
2011-01-14 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
* make-dist: Distribute test/ files too.
|
||||
|
|
@ -8813,8 +8821,9 @@
|
|||
;; coding: utf-8
|
||||
;; End:
|
||||
|
||||
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
|
||||
2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
|
||||
2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
||||
Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Emacs.
|
||||
|
||||
|
|
|
|||
|
|
@ -300,8 +300,7 @@ epaths-force: FRC
|
|||
-e 's;\(#.*PATH_BITMAPS\).*$$;\1 "${bitmapdir}";' \
|
||||
-e 's;\(#.*PATH_X_DEFAULTS\).*$$;\1 "${x_default_search_path}";' \
|
||||
-e 's;\(#.*PATH_GAME\).*$$;\1 "${gamedir}";' \
|
||||
-e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";' \
|
||||
-e 's;/[*] *arch-tag:.*;/*;') && \
|
||||
-e 's;\(#.*PATH_DOC\).*$$;\1 "${docdir}";') && \
|
||||
${srcdir}/move-if-change epaths.h.$$$$ src/epaths.h
|
||||
|
||||
# For parallel make, src should be built before leim.
|
||||
|
|
|
|||
|
|
@ -382,4 +382,3 @@ wait
|
|||
write
|
||||
xfree
|
||||
|
||||
# arch-tag: bc80061a-1168-4911-9766-46aaf2640250
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
2011-01-14 Paul Eggert <eggert@cs.ucla.edu>
|
||||
2011-01-17 Paul Eggert <eggert@cs.ucla.edu>
|
||||
|
||||
Update copyright notes to match recent gnulib-related changes.
|
||||
* notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
|
||||
|
|
@ -9,6 +9,13 @@
|
|||
subsumed by m4/*.m4 rule). config.guess, config.sub, and
|
||||
doc/man/texinfo.tex are now copied in from gnulib.
|
||||
|
||||
2011-01-15 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* charsets/cp51932.awk, charsets/eucjp-ms.awk: No longer print arch-tag.
|
||||
|
||||
* bzrmerge.el (bzrmerge-missing): Add another skip indicator.
|
||||
(bzrmerge-resolve): Also ignore cl-loaddefs.el.
|
||||
|
||||
2011-01-14 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* admin.el (set-copyright): Also handle \year in refcards/*.tex.
|
||||
|
|
|
|||
|
|
@ -216,4 +216,3 @@ src/xrdb.c
|
|||
src/xselect.c
|
||||
src/xterm.c
|
||||
|
||||
;;; arch-tag: 869126d4-4851-41b2-8470-14dd492a3c98
|
||||
|
|
|
|||
|
|
@ -90,4 +90,3 @@ mode: outline
|
|||
paragraph-separate: "[ ]*$"
|
||||
end:
|
||||
|
||||
# arch-tag: 812b9461-bc0a-46a7-925e-24bd41118463
|
||||
|
|
|
|||
|
|
@ -112,5 +112,3 @@ main (int argc, char **argv)
|
|||
return 0;
|
||||
}
|
||||
|
||||
/* arch-tag: f1be90ac-5b70-43c2-835e-5a6432a25145
|
||||
(do not change this comment) */
|
||||
|
|
|
|||
|
|
@ -97,4 +97,3 @@
|
|||
# mode: cperl
|
||||
# End:
|
||||
|
||||
# arch-tag: 20a4452d-610a-4e54-9abc-ffe79f5c0d30
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ are both lists of revnos, in oldest-first order."
|
|||
(re-search-forward "^message:\n")
|
||||
(while (and (not skip)
|
||||
(re-search-forward
|
||||
"back[- ]?port\\|merge\\|re-?generate\\|bump version" nil t))
|
||||
"back[- ]?port\\|merge\\|sync\\|re-?generate\\|bump version" nil t))
|
||||
(let ((str (buffer-substring (line-beginning-position)
|
||||
(line-end-position))))
|
||||
(when (string-match "\\` *" str)
|
||||
|
|
@ -173,7 +173,8 @@ are both lists of revnos, in oldest-first order."
|
|||
))
|
||||
;; Try to resolve the conflicts.
|
||||
(cond
|
||||
((member file '("configure" "lisp/ldefs-boot.el"))
|
||||
((member file '("configure" "lisp/ldefs-boot.el"
|
||||
"lisp/emacs-lisp/cl-loaddefs.el"))
|
||||
(call-process "bzr" nil t nil "revert" file)
|
||||
(revert-buffer nil 'noconfirm))
|
||||
(t
|
||||
|
|
|
|||
|
|
@ -307,4 +307,3 @@ install:
|
|||
clean:
|
||||
rm -f ${CHARSETS} ${TRANS_TABLE}
|
||||
|
||||
# arch-tag: 90b3bf30-1fef-45bf-b30c-665c30c22310
|
||||
|
|
|
|||
|
|
@ -70,4 +70,3 @@ function decode_big5(big5) {
|
|||
}
|
||||
|
||||
|
||||
# arch-tag: 36f08d21-0d24-4b67-852d-a9a51299586d
|
||||
|
|
|
|||
|
|
@ -120,4 +120,3 @@ END {
|
|||
}
|
||||
}
|
||||
|
||||
# arch-tag: 7e6f57c3-8e62-4af3-8916-ca67bca3a0ce
|
||||
|
|
|
|||
|
|
@ -52,8 +52,4 @@ END {
|
|||
print " (setcar x (cdr x)) (setcdr x tmp)))";
|
||||
print " map)";
|
||||
print " (define-translation-table 'cp51932-encode map))";
|
||||
print "";
|
||||
print ";; arch-tag: d21c06e5-a548-4dda-8802-c2922ff19da3";
|
||||
}
|
||||
|
||||
# arch-tag: bbae996b-2d1c-4e85-bb55-ac30146d7504
|
||||
|
|
|
|||
|
|
@ -114,4 +114,3 @@ END {
|
|||
}
|
||||
}
|
||||
|
||||
# arch-tag: 998dc444-759d-43ef-87e3-2ab205011394
|
||||
|
|
|
|||
|
|
@ -106,8 +106,5 @@ END {
|
|||
print " (setcar x (cdr x)) (setcdr x tmp)))";
|
||||
print " map)";
|
||||
print " (define-translation-table 'eucjp-ms-encode map))";
|
||||
print "";
|
||||
print ";; arch-tag: c4191096-288a-4f13-9b2a-ee7a1f11eb4a";
|
||||
}
|
||||
|
||||
# arch-tag: d9cc7af7-2d6e-48cd-8eed-a6d25226de7c
|
||||
|
|
|
|||
|
|
@ -98,4 +98,3 @@ END {
|
|||
index_to_gb(from_gb), index_to_gb(to_gb), from_unicode;
|
||||
}
|
||||
|
||||
# arch-tag: d7dbad89-a512-41a4-8ee0-ba1a4505b8c1
|
||||
|
|
|
|||
|
|
@ -120,4 +120,3 @@ END {
|
|||
}
|
||||
}
|
||||
|
||||
# arch-tag: 8e5a22ae-610e-411f-ae17-d6e528b30d71
|
||||
|
|
|
|||
|
|
@ -4,4 +4,3 @@
|
|||
printf "0x%02X%02X %s\n", ku, ten, $2;
|
||||
}
|
||||
|
||||
# arch-tag: dade6b45-b4c5-42ab-9d49-d6bf23a710b6
|
||||
|
|
|
|||
|
|
@ -143,4 +143,3 @@ else
|
|||
exit 1
|
||||
fi
|
||||
|
||||
# arch-tag: c33acb47-7eb6-4872-b871-15e1447e8f0e
|
||||
|
|
|
|||
|
|
@ -54,4 +54,3 @@
|
|||
(map-charset-chars 'func (cdr elt))
|
||||
(write-file (car elt))))
|
||||
|
||||
;;; arch-tag: 515989d7-2e2d-41cc-9163-05ad472fede4
|
||||
|
|
|
|||
|
|
@ -301,4 +301,3 @@ foreach my $fun (sort keys %texi_funtype) {
|
|||
}
|
||||
}
|
||||
|
||||
# arch-tag: e75331f5-5d1b-4393-ad5b-b0f87b5d47b0
|
||||
|
|
|
|||
|
|
@ -525,5 +525,4 @@ in the Emacs source directory."
|
|||
|
||||
(provide 'cus-test)
|
||||
|
||||
;;; arch-tag: a4991a31-548d-48fb-8ba1-1ebbe68eb2e7
|
||||
;;; cus-test.el ends here
|
||||
|
|
|
|||
|
|
@ -42,4 +42,3 @@ diff -u $old_tmp $new_tmp
|
|||
rm -f $new_tmp $old_tmp
|
||||
|
||||
|
||||
# arch-tag: ef2c96e2-ea67-4668-925c-d9a6f3d205cf
|
||||
|
|
|
|||
|
|
@ -215,4 +215,3 @@ Local Variables:
|
|||
mode: text
|
||||
End:
|
||||
|
||||
# arch-tag: caf47b2c-b56b-44f7-a760-b5bfbed15fd3
|
||||
|
|
|
|||
|
|
@ -86,4 +86,3 @@ make-changelog-diff $oldtag $newtag
|
|||
|
||||
echo " announcement created in $outfile" >&2
|
||||
|
||||
# arch-tag: 605e00c7-7330-4c45-81e1-2ed53a13c39f
|
||||
|
|
|
|||
|
|
@ -27,4 +27,3 @@ cvs -q diff -b -r $1 -r $2 $(find -name ChangeLog|sort) |
|
|||
s/^\n//
|
||||
p"
|
||||
|
||||
# arch-tag: 7604a259-40b4-4f97-86b2-496a9c546f0a
|
||||
|
|
|
|||
|
|
@ -185,4 +185,3 @@
|
|||
# mode: cperl
|
||||
# End:
|
||||
|
||||
# arch-tag: 5c3f9713-9ece-4a12-b3f8-deaff15974ba
|
||||
|
|
|
|||
|
|
@ -38,3 +38,37 @@ Or use shelves; or rebase; or do something else. See the thread for
|
|||
yet another fun excursion into the exciting world of version control.
|
||||
|
||||
http://lists.gnu.org/archive/html/emacs-devel/2010-04/msg00086.html
|
||||
|
||||
* How to merge changes from emacs-23 to trunk
|
||||
|
||||
The following description uses bound branches, presumably it works in
|
||||
a similar way with unbound ones.
|
||||
|
||||
1) Get clean, up-to-date copies of the emacs-23 and trunk branches.
|
||||
Check for any uncommitted changes with bzr status.
|
||||
|
||||
2) M-x cd /path/to/trunk
|
||||
|
||||
3) load admin/bzrmerge.el
|
||||
|
||||
4) M-x bzrmerge RET /path/to/emacs-23 RET
|
||||
|
||||
It will prompt about revisions that should be skipped, based on the
|
||||
regexp in bzrmerge-missing. If there are more revisions that you know
|
||||
need skipping, you'll have to do that by hand.
|
||||
|
||||
5) It will stop if there are any conflicts. Resolve them.
|
||||
Using smerge-mode, there are menu items to skip to the next conflict,
|
||||
and to take either the trunk, branch, or both copies.
|
||||
|
||||
6) After resolving all conflicts, you might need to run the command
|
||||
again if there are more revisions still to merge.
|
||||
You can commit either before you do this (eg if you had a lot of
|
||||
conflicts to resolve and don't want to get confused), or refrain from
|
||||
committing until bzrmerge has merged all revisions.
|
||||
|
||||
Before committing, check bzr status and bzr diff output.
|
||||
|
||||
Note that ChangeLog entries are automatically merged to the top with
|
||||
today's date, but you still might want to check them to see that too
|
||||
much is not being included.
|
||||
|
|
|
|||
|
|
@ -24,4 +24,3 @@ it from other casting. We commit the changes and can now go about modifying
|
|||
LOW and HIGH separately. When HIGH is ready to handle the type change, the
|
||||
cast can be removed.
|
||||
|
||||
;;; arch-tag: 3309cc41-5d59-421b-b7be-c94b04083bb5
|
||||
|
|
|
|||
|
|
@ -1360,4 +1360,3 @@ GNU General Public License for more details.
|
|||
You should have received a copy of the GNU General Public License
|
||||
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
;;; arch-tag: 8da1619e-2e79-41a8-9ac9-a0485daad17d
|
||||
|
|
|
|||
|
|
@ -5,4 +5,3 @@ there was a mass-change to remove such from various branches in cvs. probably
|
|||
it's a good idea to avoid adding trailing whitespace in new code/docs and in
|
||||
changes.
|
||||
|
||||
;;; arch-tag: de441379-c345-4826-a784-352b5413a698
|
||||
|
|
|
|||
|
|
@ -18,6 +18,3 @@ copy temacs.exe obj\i386
|
|||
obj\i386\temacs -batch -l loadup dump
|
||||
copy obj\i386\emacs.exe .
|
||||
|
||||
goto skipArchTag
|
||||
arch-tag: 0ca3036d-3a1e-47ea-87c6-9c0845253496
|
||||
:skipArchTag
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#!/bin/sh
|
||||
### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
|
||||
|
||||
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
||||
## Free Software Foundation, Inc.
|
||||
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
|
||||
## 2010, 2011 Free Software Foundation, Inc.
|
||||
|
||||
## Author: Miles Bader <miles@gnu.org>
|
||||
|
||||
|
|
|
|||
1
admin/unidata/.gitignore
vendored
1
admin/unidata/.gitignore
vendored
|
|
@ -1,4 +1,3 @@
|
|||
*.elc
|
||||
unidata.txt
|
||||
|
||||
# arch-tag: 1b0c916f-3060-47b4-a8c9-cff5c3598adf
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Generate data for bidi_mirroring_table, see src/bidi.c:bidi_initialize.
|
||||
|
||||
# Copyright (C) 2010, Free Software Foundation, Inc.
|
||||
# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
# Generate data for filling bidi_type_table, see src/bidi.c:bidi_initialize.
|
||||
|
||||
# Copyright (C) 2010, Free Software Foundation, Inc.
|
||||
# Copyright (C) 2010, 2011 Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
|
|
|
|||
|
|
@ -340,6 +340,3 @@ <h3 align="center"><a name="Exhibit1">EXHIBIT 1</a><br>
|
|||
|
||||
|
||||
</html>
|
||||
|
||||
<!-- arch-tag: 359e3efa-6eb2-4b4e-841c-f002d7924c5e
|
||||
(do not change this comment) -->
|
||||
|
|
|
|||
|
|
@ -5,5 +5,3 @@ echo "Please read INSTALL.BZR for instructions on how to build Emacs from Bazaar
|
|||
# Exit with failure, since people may have generic build scripts that
|
||||
# try things like "autogen.sh && ./configure && make".
|
||||
exit 1
|
||||
|
||||
# arch-tag: a123408c-fada-4bf7-98a0-a786cff918f0
|
||||
|
|
|
|||
|
|
@ -316,6 +316,3 @@ set djgpp_ver=
|
|||
set sys_malloc=
|
||||
set libxml=
|
||||
|
||||
goto skipArchTag
|
||||
arch-tag: 2d2fed23-4dc6-4006-a2e4-49daf0031f33
|
||||
:skipArchTag
|
||||
|
|
|
|||
12
configure
vendored
12
configure
vendored
|
|
@ -12262,23 +12262,23 @@ fi
|
|||
else
|
||||
PKG_CONFIG_MIN_VERSION=0.9.0
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 > 2.2.0" >&5
|
||||
$as_echo_n "checking for libxml-2.0 > 2.2.0... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 > 2.6.17" >&5
|
||||
$as_echo_n "checking for libxml-2.0 > 2.6.17... " >&6; }
|
||||
|
||||
if $PKG_CONFIG --exists "libxml-2.0 > 2.2.0" 2>&5; then
|
||||
if $PKG_CONFIG --exists "libxml-2.0 > 2.6.17" 2>&5; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
succeeded=yes
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML2_CFLAGS" >&5
|
||||
$as_echo_n "checking LIBXML2_CFLAGS... " >&6; }
|
||||
LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 > 2.2.0"|sed -e 's,///*,/,g'`
|
||||
LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 > 2.6.17"|sed -e 's,///*,/,g'`
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML2_CFLAGS" >&5
|
||||
$as_echo "$LIBXML2_CFLAGS" >&6; }
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML2_LIBS" >&5
|
||||
$as_echo_n "checking LIBXML2_LIBS... " >&6; }
|
||||
LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 > 2.2.0"|sed -e 's,///*,/,g'`
|
||||
LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 > 2.6.17"|sed -e 's,///*,/,g'`
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML2_LIBS" >&5
|
||||
$as_echo "$LIBXML2_LIBS" >&6; }
|
||||
else
|
||||
|
|
@ -12288,7 +12288,7 @@ $as_echo "no" >&6; }
|
|||
LIBXML2_LIBS=""
|
||||
## If we have a custom action on failure, don't print errors, but
|
||||
## do set a variable so people can do so.
|
||||
LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 > 2.2.0"`
|
||||
LIBXML2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libxml-2.0 > 2.6.17"`
|
||||
|
||||
fi
|
||||
|
||||
|
|
|
|||
|
|
@ -2512,7 +2512,7 @@ AC_SUBST(LIBXSM)
|
|||
### Use libxml (-lxml2) if available
|
||||
if test "${with_xml2}" != "no"; then
|
||||
### I'm not sure what the version number should be, so I just guessed.
|
||||
PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.2.0, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
|
||||
PKG_CHECK_MODULES(LIBXML2, libxml-2.0 > 2.6.17, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
|
||||
if test "${HAVE_LIBXML2}" = "yes"; then
|
||||
LIBS="$LIBXML2_LIBS $LIBS"
|
||||
AC_CHECK_LIB(xml2, htmlReadMemory, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,20 @@
|
|||
2011-01-15 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* building.texi (Compilation): Improve instructions for running two
|
||||
compilations (Bug#7573).
|
||||
|
||||
* files.texi (Backup Names): Document the new location of the
|
||||
last-resort backup file.
|
||||
|
||||
* files.texi (File Aliases): Move directory-abbrev-alist doc from Lisp
|
||||
manual. Explain why directory-abbrev-alist elements should be anchored
|
||||
(Bug#7777).
|
||||
|
||||
2011-01-15 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* msdog.texi (Windows Startup): Correct inaccurate description of
|
||||
differences between emacsclient.exe and emacsclientw.exe.
|
||||
|
||||
2011-01-02 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* rmail.texi (Rmail Display): Edit for grammar and conciseness.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
#### Makefile for the Emacs Manual
|
||||
|
||||
# Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
|
||||
# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
||||
# Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
|
|
|
|||
|
|
@ -455,7 +455,3 @@ customize dynamic abbrev expansion to handle optional prefixes by setting
|
|||
the variable @code{dabbrev-abbrev-skip-leading-regexp}. Its value
|
||||
should be a regular expression that matches the optional prefix that
|
||||
dynamic abbrev expression should ignore.
|
||||
|
||||
@ignore
|
||||
arch-tag: 638e0079-9540-48ec-9166-414083e16445
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -135,7 +135,3 @@ Support for Sun windows has been added.
|
|||
To keep up with decreasing computer memory capacity and disk space, many
|
||||
other functions and files have been eliminated in Emacs 22.3.
|
||||
@end itemize
|
||||
|
||||
@ignore
|
||||
arch-tag: 32932bd9-46f5-41b2-8a0e-fb0cc4caeb29
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -186,7 +186,3 @@ should at the very least make clear whether enabling auto-reverting
|
|||
for the buffer reliably assures that all information in the buffer is
|
||||
completely up to date (or will be after @code{auto-revert-interval}
|
||||
seconds).
|
||||
|
||||
@ignore
|
||||
arch-tag: 2983e613-a272-45f6-9593-3010ad7f865e
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -674,7 +674,3 @@ provides a different and customizable mouse buffer menu which you may
|
|||
prefer. It replaces the bindings of @code{mouse-buffer-menu},
|
||||
normally on @kbd{C-Down-Mouse-1}, and the menu bar buffer menu. You
|
||||
can customize the menu in the @code{msb} Custom group.
|
||||
|
||||
@ignore
|
||||
arch-tag: 08c43460-f4f4-4b43-9cb5-1ea9ad991695
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -122,10 +122,10 @@ confirmation before actually killing a compilation that is running.
|
|||
You can also kill the compilation process with @kbd{M-x
|
||||
kill-compilation}.
|
||||
|
||||
If you want to run two compilations at once, you should start the
|
||||
first one, then rename the @samp{*compilation*} buffer (perhaps using
|
||||
@code{rename-uniquely}; @pxref{Misc Buffer}), and start the other
|
||||
compilation. That will create a new @samp{*compilation*} buffer.
|
||||
To run two compilations at once, start the first one, then rename
|
||||
the @samp{*compilation*} buffer (perhaps using @code{rename-uniquely};
|
||||
@pxref{Misc Buffer}), then switch buffers and start the other
|
||||
compilation. This will create a new @samp{*compilation*} buffer.
|
||||
|
||||
Emacs does not expect a compiler process to launch asynchronous
|
||||
subprocesses; if it does, and they keep running after the main
|
||||
|
|
@ -1641,7 +1641,3 @@ both modes it has the effect of installing the function definition
|
|||
that point is in, but the way of doing so is different according to
|
||||
where the relevant Lisp environment is found.
|
||||
|
||||
|
||||
@ignore
|
||||
arch-tag: 9c3c2f71-b332-4144-8500-3ff9945a50ed
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -900,7 +900,3 @@ for example in the European style to @var{day}, @var{month}, @var{year}.)
|
|||
@var{mark} which specifies how to mark the date in the calendar display.
|
||||
If one of these functions decides that it applies to a certain date,
|
||||
it returns a value that contains @var{mark}, as described above.
|
||||
|
||||
@ignore
|
||||
arch-tag: 52cb299f-fd1f-4616-bfe6-91b988669431
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -1709,7 +1709,3 @@ data in Emacs from the file.
|
|||
@ifnottex
|
||||
@include cal-xtra.texi
|
||||
@end ifnottex
|
||||
|
||||
@ignore
|
||||
arch-tag: 4531ef09-9df3-449d-9c52-2b5a4a337f92
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -1163,7 +1163,3 @@ test case that simplifies debugging of display problems.
|
|||
|
||||
The @samp{--xrm} option (@pxref{Resources}) specifies additional
|
||||
X resource values.
|
||||
|
||||
@ignore
|
||||
arch-tag: fffecd9e-7329-4a51-a3cc-dd4a9889340e
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -195,7 +195,3 @@ specific variables will make sense.
|
|||
@ifnottex
|
||||
@lowersections
|
||||
@end ifnottex
|
||||
|
||||
@ignore
|
||||
arch-tag: 9be43eef-d1f4-4d03-a916-c741ea713a45
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -2605,7 +2605,3 @@ stop working. It is therefore advisable to use one and only one
|
|||
coding system, for your init file as well as the files you edit. For
|
||||
example, don't mix the @samp{latin-1} and @samp{latin-9} coding
|
||||
systems.
|
||||
|
||||
@ignore
|
||||
arch-tag: c68abddb-4410-4fb5-925f-63394e971d93
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -42,7 +42,3 @@ without explicitly assigned switches.)
|
|||
You can make Dired forget about all subdirectory switches and relist
|
||||
all subdirectories with the buffer's default switches using
|
||||
@kbd{M-x dired-reset-subdir-switches}. This also reverts the Dired buffer.
|
||||
|
||||
@ignore
|
||||
arch-tag: e3865701-9179-4ffb-bc34-d321111c688d
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -1404,7 +1404,3 @@ it onto a Dired buffer; this either moves, copies, or creates a link
|
|||
to the file in that directory. Precisely which action is taken is
|
||||
determined by the originating program. Dragging files out of a Dired
|
||||
buffer is currently not supported.
|
||||
|
||||
@ignore
|
||||
arch-tag: d105f9b9-fc1b-4c5f-a949-9b2cf3ca2fc1
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -1401,7 +1401,3 @@ page for other output. On such terminals, you might want to set the variable
|
|||
@code{no-redraw-on-reenter} non-@code{nil}; this tells Emacs to
|
||||
assume, when resumed, that the screen page it is using still contains
|
||||
what Emacs last wrote there.
|
||||
|
||||
@ignore
|
||||
arch-tag: 2219f910-2ff0-4521-b059-1bd231a536c4
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -506,7 +506,3 @@ to permit their use in free software.
|
|||
@c ispell-local-pdict: "ispell-dict"
|
||||
@c End:
|
||||
|
||||
@ignore
|
||||
arch-tag: d68e7b7a-0c7c-4c15-905b-a9482214e25a
|
||||
@end ignore
|
||||
|
||||
|
|
|
|||
|
|
@ -136,7 +136,3 @@ the Emacs manual.
|
|||
@printindex cp
|
||||
|
||||
@bye
|
||||
|
||||
@ignore
|
||||
arch-tag: 75c33f13-32c6-41b6-9537-847a312e2e49
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -412,7 +412,3 @@ commands.
|
|||
@ifnottex
|
||||
@xref{Hooks}.
|
||||
@end ifnottex
|
||||
|
||||
@ignore
|
||||
arch-tag: cda63f09-9c5f-4ea1-adb9-4a820fdfb24e
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -181,7 +181,3 @@ keys to run any commands of your choice (@pxref{Keymaps}).
|
|||
@ifnottex
|
||||
@lowersections
|
||||
@end ifnottex
|
||||
|
||||
@ignore
|
||||
arch-tag: df798d8b-f253-4113-b585-f528f078a944
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -568,10 +568,10 @@ another from the newly saved contents if you save again.
|
|||
appending @samp{~} to the file name being edited; thus, the backup
|
||||
file for @file{eval.c} would be @file{eval.c~}.
|
||||
|
||||
If access control stops Emacs from writing backup files under the usual
|
||||
names, it writes the backup file as @file{%backup%~} in your home
|
||||
directory. Only one such file can exist, so only the most recently
|
||||
made such backup is available.
|
||||
If access control stops Emacs from writing backup files under the
|
||||
usual names, it writes the backup file as @file{~/.emacs.d/%backup%~}.
|
||||
Only one such file can exist, so only the most recently made such
|
||||
backup is available.
|
||||
|
||||
Emacs can also make @dfn{numbered backup files}. Numbered backup
|
||||
file names contain @samp{.~}, the number, and another @samp{~} after
|
||||
|
|
@ -1160,7 +1160,6 @@ links point to directories.
|
|||
|
||||
@vindex find-file-existing-other-name
|
||||
@vindex find-file-suppress-same-file-warnings
|
||||
|
||||
Normally, if you visit a file which Emacs is already visiting under
|
||||
a different name, Emacs displays a message in the echo area and uses
|
||||
the existing buffer visiting that file. This can happen on systems
|
||||
|
|
@ -1182,6 +1181,31 @@ then the file name recorded for a buffer is the file's @dfn{truename}
|
|||
than the name you specify. Setting @code{find-file-visit-truename} also
|
||||
implies the effect of @code{find-file-existing-other-name}.
|
||||
|
||||
@cindex directory name abbreviation
|
||||
@vindex directory-abbrev-alist
|
||||
Sometimes, a directory is ordinarily accessed through a symbolic
|
||||
link, and you may want Emacs to preferentially display its ``linked''
|
||||
name instead of its truename. To do this, customize the variable
|
||||
@code{directory-abbrev-alist}. Each element in this list should have
|
||||
the form @code{(@var{from} . @var{to})}, which says to replace
|
||||
@var{from} with @var{to} when it appears in a directory name. For
|
||||
this feature to work properly, @var{from} and @var{to} should point to
|
||||
the same file. The @var{from} string is actually a regular expression
|
||||
(@pxref{Regexps}); it should always start with @samp{\`}, to avoid
|
||||
matching to an incorrect part of the original directory name. The
|
||||
@var{to} string should be an ordinary absolute directory name. Do not
|
||||
use @samp{~} to stand for a home directory in the @var{to} string;
|
||||
Emacs performs these substitutions separately.
|
||||
|
||||
Here's an example, from a system on which file system
|
||||
@file{/home/fsf} and so on are normally accessed through symbolic
|
||||
links named @file{/fsf} and so on.
|
||||
|
||||
@example
|
||||
(("\\`/home/fsf" . "/fsf")
|
||||
("\\`/home/gd" . "/gd"))
|
||||
@end example
|
||||
|
||||
@node Directories
|
||||
@section File Directories
|
||||
|
||||
|
|
@ -1974,7 +1998,3 @@ menu, where each existing fileset is represented by a submenu.
|
|||
Control} to describe sets of files to be treated as a group for
|
||||
purposes of version control operations. Those filesets are unnamed
|
||||
and do not persist across Emacs sessions.
|
||||
|
||||
@ignore
|
||||
arch-tag: 768d32cb-e15a-4cc1-b7bf-62c00ee12250
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -423,7 +423,3 @@ that it only checks words in comments and string constants. This
|
|||
feature is useful for editing programs. Type @kbd{M-x
|
||||
flyspell-prog-mode} to enable or disable this mode in the current
|
||||
buffer.
|
||||
|
||||
@ignore
|
||||
arch-tag: 3359a443-96ed-448f-9f05-c8111ba8eac0
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -582,7 +582,3 @@ to @samp{continue}, provided Abbrev mode is enabled.@refill
|
|||
|
||||
Type @samp{;?} or @samp{;C-h} to display a list of all the built-in
|
||||
Fortran abbrevs and what they stand for.
|
||||
|
||||
@ignore
|
||||
arch-tag: 23ed7c36-1517-4646-9235-2d5ade5f06f6
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -1439,7 +1439,3 @@ again.
|
|||
In the console on GNU/Linux, you can use @kbd{M-x gpm-mouse-mode} to
|
||||
enable terminal mouse support. You must have the gpm package
|
||||
installed and running on your system in order for this to work.
|
||||
|
||||
@ignore
|
||||
arch-tag: 7dcf3a31-a43b-45d4-a900-445b10d77e49
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -1372,7 +1372,3 @@ Yanking means reinserting text previously killed (q.v.@:). It can be
|
|||
used to undo a mistaken kill, or for copying or moving text. Some
|
||||
other systems call this ``pasting.'' @xref{Yanking}.
|
||||
@end table
|
||||
|
||||
@ignore
|
||||
arch-tag: 0dd53ce1-5f09-4ac2-b13b-cf22b0f28d23
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -549,7 +549,3 @@ this are bureaucracy and isometric struggles against competition. Free
|
|||
software will greatly reduce these drains in the area of software
|
||||
production. We must do this, in order for technical gains in productivity
|
||||
to translate into less work for us.
|
||||
|
||||
@ignore
|
||||
arch-tag: 21eb38f8-6fa0-480a-91cd-f3dab7148542
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -715,7 +715,3 @@ library, you may consider it more useful to permit linking proprietary
|
|||
applications with the library. If this is what you want to do, use
|
||||
the GNU Lesser General Public License instead of this License. But
|
||||
first, please read @url{http://www.gnu.org/philosophy/why-not-lgpl.html}.
|
||||
|
||||
@ignore
|
||||
arch-tag: 8b9947e1-c830-4d70-8907-a97e556731ba
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -677,7 +677,3 @@ help text for active buffer text using the keyboard. @kbd{C-h .}
|
|||
character after point, using the echo area. To display help text
|
||||
automatically whenever it is available on the character after point, set
|
||||
the variable @code{help-at-pt-display-when-idle} to @code{t}.
|
||||
|
||||
@ignore
|
||||
arch-tag: 6f33ab62-bc75-4367-8057-fd67cc15c3a1
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -258,7 +258,3 @@ preserving the columns of all nonblank text. @kbd{M-x tabify} scans the
|
|||
region for sequences of spaces, and converts sequences of at least two
|
||||
spaces to tabs if that can be done without changing indentation. @kbd{M-x
|
||||
untabify} changes all tabs in the region to appropriate numbers of spaces.
|
||||
|
||||
@ignore
|
||||
arch-tag: acc07de7-ae11-4ee8-a159-cb59c473f0fb
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -667,7 +667,3 @@ navigate to each of the words you want in the list, mark it (e.g. with
|
|||
@kbd{S-M-f}), copy it to the list with @kbd{C-c} or @kbd{M-w}, and
|
||||
insert a newline after the word in the target list by pressing
|
||||
@key{RET}.
|
||||
|
||||
@ignore
|
||||
arch-tag: d8da8f96-0928-449a-816e-ff2d3497866c
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -569,7 +569,3 @@ including the final @kbd{C-j}), and appends them at the end of the
|
|||
keyboard macro; it then terminates the step-editing and replaces the
|
||||
original keyboard macro with the edited macro.
|
||||
@end itemize
|
||||
|
||||
@ignore
|
||||
arch-tag: c1b0dd3b-3159-4c08-928f-52e763953e9c
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -69,7 +69,3 @@ the command is followed by arguments.
|
|||
@kbd{M-x} works by running the command
|
||||
@code{execute-extended-command}, which is responsible for reading the
|
||||
name of another command and invoking it.
|
||||
|
||||
@ignore
|
||||
arch-tag: b67bff53-9628-4666-b94e-eda972a7ba56
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -235,7 +235,3 @@ However, this does not happen if the buffer contents specify a major
|
|||
mode, and certain ``special'' major modes do not allow the mode to
|
||||
change. You can turn off this mode-changing feature by setting
|
||||
@code{change-major-mode-with-file-name} to @code{nil}.
|
||||
|
||||
@ignore
|
||||
arch-tag: f2558800-cf32-4839-8acb-7d3b4df2a155
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -447,7 +447,3 @@ mode only until the mark is deactivated. One reason you may want to
|
|||
use them is that some commands operate on the entire buffer instead of
|
||||
the region when Transient Mark mode is off. Enabling Transient Mark
|
||||
mode momentarily gives you a way to use these commands on the region.
|
||||
|
||||
@ignore
|
||||
arch-tag: f35e4d82-911b-4cfc-a3d7-3c87b2abba20
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -654,7 +654,3 @@ password (@pxref{Killing}). You may type either @key{RET} or
|
|||
@key{ESC} to submit the password. Any other self-inserting character
|
||||
key inserts the associated character into the password, and all other
|
||||
input is ignored.
|
||||
|
||||
@ignore
|
||||
arch-tag: ba913cfd-b70e-400f-b663-22b2c309227f
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -2883,7 +2883,3 @@ idle.
|
|||
@ifnottex
|
||||
@lowersections
|
||||
@end ifnottex
|
||||
|
||||
@ignore
|
||||
arch-tag: 8f094220-c0d5-4e9e-af7d-3e0da8187474
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -613,7 +613,3 @@ MS-DOS supports only some of the possible options you can mention in
|
|||
the @code{dired-listing-switches} variable. The options that work are
|
||||
@samp{-A}, @samp{-a}, @samp{-c}, @samp{-i}, @samp{-r}, @samp{-S},
|
||||
@samp{-s}, @samp{-t}, and @samp{-u}.
|
||||
|
||||
@ignore
|
||||
arch-tag: 868d50ff-07f8-4a13-a807-dab6f1cdb431
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -90,20 +90,24 @@ Via the Emacs client program, @file{emacsclient.exe} or
|
|||
programs, and to reuse a running Emacs process for serving editing
|
||||
jobs required by other programs. @xref{Emacs Server}. The difference
|
||||
between @file{emacsclient.exe} and @file{emacsclientw.exe} is that the
|
||||
former waits for Emacs to signal that the editing job is finished,
|
||||
while the latter does not wait. Which one of them to use in each case
|
||||
depends on the expectations of the program that needs editing
|
||||
services. If the program will use the edited files, it needs to wait
|
||||
for Emacs, so you should use @file{emacsclient.exe}. By contrast, if
|
||||
the results of editing are not needed by the invoking program, you
|
||||
will be better off using @file{emacsclientw.exe}. A notable situation
|
||||
where you would want @file{emacsclientw.exe} is when you right-click
|
||||
on a file in the Windows Explorer and select ``Open With'' from the
|
||||
pop-up menu. Use the @samp{--alternate-editor=} or @samp{-a} options
|
||||
if Emacs might not be running (or not running as a server) when
|
||||
@command{emacsclient} is invoked---that will always give you an
|
||||
editor. When invoked via @command{emacsclient}, Emacs will start in
|
||||
the current directory of the program that invoked
|
||||
former is a console program, while the latter is a Windows GUI
|
||||
program. Both programs wait for Emacs to signal that the editing job
|
||||
is finished, before they exit and return control to the program that
|
||||
invoked them. Which one of them to use in each case depends on the
|
||||
expectations of the program that needs editing services. If that
|
||||
program is itself a console (text-mode) program, you should use
|
||||
@file{emacsclient.exe}, so that any of its messages and prompts appear
|
||||
in the same command window as those of the invoking program. By
|
||||
contrast, if the invoking program is a GUI program, you will be better
|
||||
off using @file{emacsclientw.exe}, because @file{emacsclient.exe} will
|
||||
pop up a command window if it is invoked from a GUI program. A
|
||||
notable situation where you would want @file{emacsclientw.exe} is when
|
||||
you right-click on a file in the Windows Explorer and select ``Open
|
||||
With'' from the pop-up menu. Use the @samp{--alternate-editor=} or
|
||||
@samp{-a} options if Emacs might not be running (or not running as a
|
||||
server) when @command{emacsclient} is invoked---that will always give
|
||||
you an editor. When invoked via @command{emacsclient}, Emacs will
|
||||
start in the current directory of the program that invoked
|
||||
@command{emacsclient}.
|
||||
@end enumerate
|
||||
|
||||
|
|
|
|||
|
|
@ -1745,7 +1745,3 @@ highlighted region covering a contiguous range of character positions
|
|||
may look discontinuous if the region spans reordered text. This is
|
||||
normal and similar to behavior of other programs that support
|
||||
bidirectional text.
|
||||
|
||||
@ignore
|
||||
arch-tag: 310ba60d-31ef-4ce7-91f1-f282dd57b6b3
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -285,7 +285,3 @@ other modes. @kbd{C-c C-y} (@code{picture-yank-rectangle}) inserts
|
|||
(by overwriting) the rectangle that was most recently killed, while
|
||||
@kbd{C-c C-x} (@code{picture-yank-rectangle-from-register}) does
|
||||
likewise for the rectangle found in a specified register.
|
||||
|
||||
@ignore
|
||||
arch-tag: 10e423ad-d896-42f2-a7e8-7018adeaf8c2
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -1839,7 +1839,3 @@ starts comments in assembler syntax.
|
|||
@ifnottex
|
||||
@include fortran-xtra.texi
|
||||
@end ifnottex
|
||||
|
||||
@ignore
|
||||
arch-tag: c7ee7409-40a4-45c7-bfb7-ae7f2c74d0c0
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -330,7 +330,3 @@ points to.
|
|||
Insert in the buffer the @emph{contents} of the file that bookmark
|
||||
@var{bookmark} points to.
|
||||
@end table
|
||||
|
||||
@ignore
|
||||
arch-tag: b00af991-ebc3-4b3a-8e82-a3ac81ff2e64
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -1506,7 +1506,3 @@ include the following in the Rmail inbox list:
|
|||
@smallexample
|
||||
maildir://var/spool/mail/in
|
||||
@end smallexample
|
||||
|
||||
@ignore
|
||||
arch-tag: 034965f6-38df-47a2-a9f1-b8bc8ab37e23
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -320,7 +320,3 @@ items, and then you can type @key{RET} to select the item.
|
|||
that item; it is usually the initial of some word in the item's name.
|
||||
This letter or digit is separated from the item name by @samp{=>}. You
|
||||
can type the item's letter or digit to select the item.
|
||||
|
||||
@ignore
|
||||
arch-tag: 104ba40e-d972-4866-a542-a98be94bdf2f
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -1378,7 +1378,3 @@ it never deletes lines that are only partially contained in the region
|
|||
|
||||
If a match is split across lines, this command keeps all those lines.
|
||||
@end table
|
||||
|
||||
@ignore
|
||||
arch-tag: fd9d8e77-66af-491c-b212-d80999613e3e
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -713,7 +713,3 @@ buffer, and their commands are different as well.
|
|||
Similarly, to specify your preferred method for reading mail,
|
||||
customize the variable @code{read-mail-command}. The default is
|
||||
@code{rmail} (@pxref{Rmail}).
|
||||
|
||||
@ignore
|
||||
arch-tag: d8a3dfc3-5d87-45c5-a7f2-69871b8e4fd6
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -2925,7 +2925,3 @@ then inserts the generated table in the proper syntax into the
|
|||
destination buffer. The default destination buffer is
|
||||
@code{table.@var{lang}}, where @var{lang} is the language you
|
||||
specified.
|
||||
|
||||
@ignore
|
||||
arch-tag: 8db54ed8-2036-49ca-b0df-23811d03dc70
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -24,7 +24,3 @@ the Emacs Manual}). This chapter describes more advanced VC usage.
|
|||
@iftex
|
||||
@include vc1-xtra.texi
|
||||
@end iftex
|
||||
|
||||
@ignore
|
||||
arch-tag: 11a18d0e-1baf-49da-8e38-f61195ae4dc3
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -787,7 +787,3 @@ only for repositories from hosts that match the pattern.
|
|||
operations in the variable @code{vc-cvs-global-switches}. These
|
||||
switches are inserted immediately after the @code{cvs} command, before
|
||||
the name of the operation to invoke.
|
||||
|
||||
@ignore
|
||||
arch-tag: 8e8c2a01-ad41-4e61-a89a-60131ad67263
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -397,7 +397,3 @@ windows together. You can also turn it on by customizing the variable
|
|||
scroll-all-scroll-down-all}, @kbd{M-x scroll-all-page-down-all} and
|
||||
their corresponding ``up'' equivalents. To make this mode useful,
|
||||
you should bind these commands to appropriate keys.
|
||||
|
||||
@ignore
|
||||
arch-tag: 8bea7453-d4b1-49b1-9bf4-cfe4383e1113
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -1219,7 +1219,3 @@ family. It corresponds to the fifth part of an X font name. It is one of
|
|||
@noindent
|
||||
@var{size} is a decimal number that describes the font size in points.
|
||||
@end ifnottex
|
||||
|
||||
@ignore
|
||||
arch-tag: 9b6ff773-48b6-41f6-b2f9-f114b8bdd97f
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -449,8 +449,8 @@
|
|||
;; coding: utf-8
|
||||
;; End:
|
||||
|
||||
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
|
||||
2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
|
||||
2010, 2011 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Emacs.
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
#### Makefile for the Emacs Lisp Introduction manual
|
||||
|
||||
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
|
||||
# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||
# 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
|
||||
# Free Software Foundation, Inc.
|
||||
|
||||
# This file is part of GNU Emacs.
|
||||
|
||||
|
|
|
|||
|
|
@ -506,7 +506,3 @@ to permit their use in free software.
|
|||
@c ispell-local-pdict: "ispell-dict"
|
||||
@c End:
|
||||
|
||||
@ignore
|
||||
arch-tag: 839f250e-4800-4bc9-bd28-49ec7968331f
|
||||
@end ignore
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,13 @@
|
|||
2011-01-15 Chong Yidong <cyd@stupidchicken.com>
|
||||
|
||||
* files.texi (Directory Names): Move directory-abbrev-alist doc to
|
||||
Emacs manual.
|
||||
|
||||
2011-01-15 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* files.texi (Directory Names): Explain why FROM in
|
||||
directory-abbrev-alist should begin with \`. (Bug#7777)
|
||||
|
||||
2011-01-11 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* loading.texi (Hooks for Loading): Adjust doc of eval-after-load.
|
||||
|
|
|
|||
|
|
@ -512,7 +512,3 @@ added to the table.
|
|||
|
||||
@end table
|
||||
|
||||
|
||||
@ignore
|
||||
arch-tag: 5ffdbe08-2cd4-48ec-a5a8-080f95756eec
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -777,7 +777,3 @@ pieces of advice is the same. The only difference is that
|
|||
executed even if some previous piece of advice had an error or a
|
||||
non-local exit. If any around-advice is protected, then the whole
|
||||
around-advice onion is protected as a result.
|
||||
|
||||
@ignore
|
||||
arch-tag: 80c135c2-f1c3-4f8d-aa85-f8d8770d307f
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -154,7 +154,3 @@ Many variables have been removed, including @code{read-circle},
|
|||
@code{inhibit-changing-match-data}, @code{wrap-prefix}, and
|
||||
@code{line-prefix},
|
||||
@end itemize
|
||||
|
||||
@ignore
|
||||
arch-tag: 1d0ef137-2bad-430e-ae8e-d820d569b5a6
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -36,7 +36,3 @@ are peculiar to Emacs Lisp or relate specifically to editing.
|
|||
|
||||
@hfil
|
||||
@bye
|
||||
|
||||
@ignore
|
||||
arch-tag: ac7694c8-1f02-4b42-9531-33ba13b179e1
|
||||
@end ignore
|
||||
|
|
|
|||
|
|
@ -752,7 +752,3 @@ This normal hook is run by @code{revert-buffer} after inserting
|
|||
the modified contents---but only if @code{revert-buffer-function} is
|
||||
@code{nil}.
|
||||
@end defvar
|
||||
|
||||
@ignore
|
||||
arch-tag: 295a6321-e5ab-46d5-aef5-0bb4f447a67f
|
||||
@end ignore
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Reference in a new issue