Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 615-621)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 197-199)

   - Merge from emacs--devo--0
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-166
This commit is contained in:
Miles Bader 2007-01-30 22:22:43 +00:00
commit bb5b9e9dbe
118 changed files with 2221 additions and 5688 deletions

View file

@ -1,3 +1,19 @@
2007-01-29 Chong Yidong <cyd@stupidchicken.com>
* configure.in: Restore support for hp800's not running HP-UX.
* configure: Regenerate.
2007-01-27 Chong Yidong <cyd@stupidchicken.com>
* configure.in: Remove support for hp800 and sr2k machine types.
* configure: Regenerate.
2007-01-26 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* configure.in: Add check for libXft.
2007-01-18 Bruno Haible <bruno@clisp.org> (tiny change) 2007-01-18 Bruno Haible <bruno@clisp.org> (tiny change)
* INSTALL: Info files moved to share/info. * INSTALL: Info files moved to share/info.

View file

@ -1,3 +1,7 @@
2007-01-27 Jan Dj,AC$(Brv <jhd@winter.localdomain>
* FOR-RELEASE: Removed Gtk/Xft issue.
2007-01-01 Miles Bader <miles@gnu.org> 2007-01-01 Miles Bader <miles@gnu.org>
* quick-install-emacs (get_config_var): Deal with weird magic * quick-install-emacs (get_config_var): Deal with weird magic

View file

@ -5,6 +5,8 @@ Tasks needed before the next release.
not at the start of the file that are easy to miss, as in not at the start of the file that are easy to miss, as in
src/emacs.c. src/emacs.c.
See also the oustanding issues in admin/notes/copyright.
* TO BE DONE SHORTLY BEFORE RELEASE * TO BE DONE SHORTLY BEFORE RELEASE
** Check for widow and orphan lines in manuals; ** Check for widow and orphan lines in manuals;
@ -31,6 +33,10 @@ sk Miroslav Vaško No response
Reminders sent out on 2006-06-08. Reminders sent out on 2006-06-08.
Note: regardless of the above, the following files need to be
regenerated to get updated copyright notices: sk-refcard.ps,
pl-refcard.ps, cs-refcard.ps.
** Send an email to the various distributions, including the GNOME ** Send an email to the various distributions, including the GNOME
and KDE projects, to use the new Emacs icons in etc/images/icons. and KDE projects, to use the new Emacs icons in etc/images/icons.
@ -66,11 +72,6 @@ RMS says that there is no code in the generated defcustom,
or elsewhere in the generated code, to implement setting that variable or elsewhere in the generated code, to implement setting that variable
through the custom mechanism. through the custom mechanism.
** b.riefenstahl@turtle-trading.net, Dec 29:
GTK build crashes under X
Seems to be a libXft or gtk theme bug, not an Emacs bug.
However, a workaround is possible.
** simon.marshall@misys.com, Jan 12: ** simon.marshall@misys.com, Jan 12:
Font-lock decides function call is function declaration in C+ + Font-lock decides function call is function declaration in C+ +

235
admin/notes/copyright Normal file
View file

@ -0,0 +1,235 @@
NOTES ON COPYRIGHTS AND LICENSES
Some terminology:
A "copyright notice" consists of one or a few lines of this format:
"Copyright (C) 2006, 2007 Free Software Foundation, Inc."
A "license notice" is a statement of permissions, and is usually much
longer, eg the text "GNU Emacs is free software...".
Every non-trivial file distributed through the Emacs CVS should be
self-explanatory in terms of copyright and license. This includes
files that are not distributed in Emacs releases (for example, the
admin/ directory), because the whole Emacs CVS is publicly
available.
The definition of triviality is a little vague, but a rule of thumb is
that any file with less than 15 lines of actual content is trivial. If
a file is auto-generated (eg ldefs-boot.el) from another one in the
CVS, then it does not really matter about adding a copyright statement
to the generated file.
The years in the copyright notice should be updated every year (see
file "years" in this directory). The PS versions of refcards etc
should display copyright notices (an exception to the rule about
"generated" files), but these can just display the latest year. The
full list of years should be kept in comments in the source file. If
these are distributed in CVS, check in a regenerated version when the
tex files are updated.
Copyright changes should be propagated to any associated repositories
(eg Gnus, MH-E), but I think in every case this happens automatically
(?).
All README (and other such text files) that are non-trivial and were
added by Emacs developers need copyright and copying permission
statements (see eg INSTALL in the top-level directory).
All images files that allow for comments should have copyright and
license statements. Whether or not this is possible, the information
should be recorded in a README file in each directory with images.
When installing a file with an "unusual" license (after checking first
it is ok), put a copy of the copyright and license in the file (if
possible. It's ok if this makes the file incompatible with its
original format, if it can still be used by Emacs), or in a README
file in the relevant directory.
The vast majority of files are copyright FSF and distributed under the
GPL. A few files (mainly related to language and charset support) are
copyright AIST alone, or both AIST and FSF. (Contact Kenichi Handa
with questions about legal issues in such files.) In all these cases,
the copyright years in each file should be updated each year.
There are some exceptions to the points in the previous paragraph, and
these are listed below for reference, together with any files where
the copyright needs to be updated in "unusual" ways.
If you find any other such cases, please consult to check they are ok,
and note them in this file. This includes missing copyright notices,
and "odd" copyright holders. In most cases, individual authors should
not appear in copyright statements. Either the copyright has been
assigned (check copyright.list) to the FSF (in which case the original
author should be removed and the year(s) transferred to the FSF); or
else it is possible the file should not be in Emacs at all (please
report!).
[For reference, most of these points were established via email with
rms, 2007/1, "Copyright years".]
<top-level>/install-sh
lispintro/install-sh
- this file is copyright MIT, which is OK. Leave the copyright alone.
etc/edt-user.doc
- update BOTH notices in this file
[etc/orgcard.tex, orgcard.ps - files removed 2007/1/29]
- with no assignment from Rooke, these files were removed. We are
asking for an assignment, and if one is received the files will be
replaced.
leim/CXTERM-DIC/4Corner.tit, ARRAY30.tit, CCDOSPY.tit, ECDICT.tit,
ETZY.tit, PY-b5.tit, Punct-b5.tit, Punct.tit, QJ-b5.tit, QJ.tit,
SW.tit, TONEPY.tit, ZOZY.tit
- leave the copyrights alone.
leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns,
pinyin.map, ziranma.cin
- leave the copyright alone.
leim/SKK-DIC/SKK-JISYO.L
ja-dic/ja-dic.el
(the latter is auto-generated from the former). Leave the copyright alone.
lib-src/etags.c
- this has a copyright Ken Arnold. We are still deciding what should
be done here (see below).
lib-src/getopt1.c, getopt_int.h
- these are from the GNU C library. Leave the copyrights alone.
lisp/play/tetris.el
- no special rules about the copyright. We note here that we believe
(2007/1) there is no problem with our use of the name "tetris" or
the concept.
rms: "My understanding is that game rules as such are not copyrightable."
<http://lists.gnu.org/archive/html/emacs-devel/2007-01/msg00960.html>
lispref/doclicense.texi
man/doclicense.texi
- leave the copyright alone in this imported file.
lisp/net/tramp.el
- there are also copyrights in the body of the file. Update these too.
msdos/is_exec.c, sigaction.c
- these files are copyright DJ Delorie. Leave the copyrights alone.
src/gmalloc.c
- contains numerous copyrights from the GNU C library. Leave them alone.
[src/unexhp9k800.c - removed 2007/1/27
[src/m/sr2k.h - removed 2007/1/27]
- First file removed due to legal uncertainties; second file removed
due to dependency on first. Note that src/m/hp800.h is still needed on
hp800 arch.
*** These are copyright issues still to be addressed:
Is it OK to just `cvs remove' a file for legal reasons, or is
something more drastic needed? A removed file is still available from
CVS, if suitable options are applied.
All README (and other such files) that are non-trivial and were added
by Emacs developers need copyright statements and copying permissions
to be added.
All images files that allow for comments should have copyright and
license statements added. Whether or not this is possible, the
information should be recorded in a README file in each directory with
images. Image files to consider (is there such a thing as a "trivial"
image?):
src/bitmaps/
etc/*.xpm, *.xbm
etc/images/
etc/tree-widget/
etc/*.ps, .eps
admin/check-doc-strings
Author is Martin Buchholz, but no assignment from him on file, and
rms has no way to reach him.
admin/make-announcement - no copyright
admin/nt/makedist.bat - no copyright
etc/ms-kermit - no copyright, but ms-7bkermit has one
etc/e/eterm-color.ti - no copyright
rms: "I think that is not copyrightable under the merger doctrine
because the entries are all forced. At least that is the case in the
US; I am not sure whether we can rely on that in general."
For the above files, mail sent from rms to Matthew (Martin?) Norwood
asking what to do (via Eben Moglen), 2007/1/22 ("Copyright years").
etc/gnus-refcard.tex
I (rgm) think the "Gnus Bugfixing Girls + Boys" copyright should
probably be removed, but it may be ok (waiting for rms)
[etc/orgcard.tex, orgcard.ps]
Re-add these files if an assignment is received from Rooke.
etc/sk-refcard.ps, pl-refcard.ps, cs-refcard.ps
These refcards need to be regenerated (by those with suitable TeX
setups) to get updated copyrights.
lib-src/etags.c - no 'k.* arnold' in copyright.list'
rms: "That is ok, in principle. I used free code released by Ken
Arnold as the starting point. However, it may be that we need to get
and insert whatever his license was for his code."
lispref/back.texi, elisp-covers.texi, lay-flat.texi,
two-volume-cross-refs.txt, two.el
- add standard notices to any decided to be non-trivial.
lwlib/lwlib-int.h, lwlib.h - no copyright
lwlib/Makefile.in, lwlib-utils.c, lwlib.c - copyright Lucid
lwlib/lwlib-Xaw.c - copyright Chuck Thompson
lwlib/lwlib.c - copyright Lucid, but FSF copyright was added in 2002 -
was that correct?
rms: "I asked Matthew Norwood about these, I believe."
man/back.texi, trampver.texi
- add standard notices to any decided to be non-trivial.
msdos/
- do we need to add COPYING.LIB (because COPYING.DJ refers to it)?
(but see below).
msdos/is_exec.c
- does copying.dj replace eliz's copyright?
msdos/is_exec.c, sigaction.c
- relicense under the GPL
oldXMenu/
- should there be any FSF copyrights at all in here? Some were added
in 2005, without licence notices. Was this right?
oldXMenu/Makefile.in, Makefile, Imakefile, descrip.mms, insque.c
- issues described in mail to rms, 2006/12/17.
rms: "I have asked for lawyer's advice about these."
src/acldef.h, chpdef.h, gnu.h, ndir.h
src/m/mips4.h, news-r6.h, news-risc.h, pmax.h
src/s/aix3-2.h, bsd386.h, hpux8.h, hpux9.h, irix4-0.h, irix5-0.h,
isc2-2.h, netbsd.h, osf1.h, sol2-3.h, sunos4-0.h, umips.h, usg5-4-2.h
- all these (not obviously trivial) files are missing copyrights.
rms: "I should talk about these with Matthew Norwood."

View file

@ -1,5 +1,5 @@
How to Maintain Copyright Years for GNU Emacs How to Maintain Copyright Years for GNU Emacs
(see also file "copyright" in this directory)
"Our lawyer says it is ok if we add, to each file that has been in Emacs "Our lawyer says it is ok if we add, to each file that has been in Emacs
since Emacs 21 came out in 2001, all the subsequent years[1]. We don't since Emacs 21 came out in 2001, all the subsequent years[1]. We don't
@ -20,24 +20,6 @@ For the refcards under etc/, it's ok to simply use the latest year
notice, while maintaining the full list of years in the copyright notice notice, while maintaining the full list of years in the copyright notice
in the comments. in the comments.
Please fix or report any non-trivial files that have "odd" copyright
notices. This includes missing copyright notices, and copyright
holders other than FSF (or AIST in some cases). In most cases,
individual authors should not appear in copyright statements. Either
the copyright has been assigned (check copyright.list) to the FSF (in
which case the original author should be removed and the year(s)
transferred to the FSF); or else it is possible the file should not be
in Emacs at all (please report!).
When updating the copyright in a file (eg a .tex file) that generates
another file distributed with Emacs, don't forget to check in a
regenerated version of the target file.
For auto-generated files (eg ldefs-boot.el), RMS says (20061211,
private mail): "Since they are automatically generated, it doesn't
really matter what they say."
------------------------------------------------------------------------------ ------------------------------------------------------------------------------

View file

@ -1,9 +1,33 @@
#!/bin/sh #!/bin/sh
# quick-install-emacs -- do a halfway-decent job of installing emacs quickly ### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
# Written by Miles Bader <miles@gnu.org>
## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
## Free Software Foundation, Inc.
## Author: Miles Bader <miles@gnu.org>
## 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., 51 Franklin Street, Fifth Floor,
## Boston, MA 02110-1301, USA.
### Commentary:
## This script is mainly intended for emacs maintainer or pretesters who
## install emacs very often. See the --help output for more details.
# This script is mainly intended for emacs maintainer or pretesters who
# install emacs very often. See the --help output for more details.
PUBLIC_LIBSRC_BINARIES='b2m emacsclient etags ctags ebrowse' PUBLIC_LIBSRC_BINARIES='b2m emacsclient etags ctags ebrowse'
PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin' PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin'

43
configure vendored
View file

@ -2581,13 +2581,6 @@ _ACEOF
machine=nh6000 opsys=powerunix machine=nh6000 opsys=powerunix
NON_GNU_CPP="cc -Xo -E -P" NON_GNU_CPP="cc -Xo -E -P"
;; ;;
## SR2001/SR2201 running HI-UX/MPP
hppa1.1-hitachi-hiuxmpp* )
machine=sr2k opsys=hiuxmpp
;;
hppa1.1-hitachi-hiuxwe2* )
machine=sr2k opsys=hiuxwe2
;;
## Honeywell XPS100 ## Honeywell XPS100
xps*-honeywell-sysv* ) xps*-honeywell-sysv* )
machine=xps100 opsys=usg5-2 machine=xps100 opsys=usg5-2
@ -2610,46 +2603,10 @@ _ACEOF
esac esac
;; ;;
## HP 9000 series 700 and 800, running HP/UX
hppa*-hp-hpux7* )
machine=hp800 opsys=hpux
;;
hppa*-hp-hpux8* )
machine=hp800 opsys=hpux8
;;
hppa*-hp-hpux9shr* )
machine=hp800 opsys=hpux9shr
;;
hppa*-hp-hpux9* )
machine=hp800 opsys=hpux9
;;
hppa*-hp-hpux10.2* )
machine=hp800 opsys=hpux10-20
;;
hppa*-hp-hpux10* )
machine=hp800 opsys=hpux10
;;
hppa*-hp-hpux1[1-9]* )
machine=hp800 opsys=hpux11
CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
;;
hppa*-*-linux-gnu* ) hppa*-*-linux-gnu* )
machine=hp800 opsys=gnu-linux machine=hp800 opsys=gnu-linux
;; ;;
## HP 9000 series 700 and 800, running HP/UX
hppa*-hp-hpux* )
## Cross-compilation? Nah!
case "`uname -r`" in
## Someone's system reports A.B8.05 for this.
## I wonder what other possibilities there are.
*.B8.* ) machine=hp800 opsys=hpux8 ;;
*.08.* ) machine=hp800 opsys=hpux8 ;;
*.09.* ) machine=hp800 opsys=hpux9 ;;
*) machine=hp800 opsys=hpux10 ;;
esac
;;
hppa*-*-nextstep* ) hppa*-*-nextstep* )
machine=hp800 opsys=nextstep machine=hp800 opsys=nextstep
;; ;;

View file

@ -594,13 +594,6 @@ dnl see the `changequote' comment above.
machine=nh6000 opsys=powerunix machine=nh6000 opsys=powerunix
NON_GNU_CPP="cc -Xo -E -P" NON_GNU_CPP="cc -Xo -E -P"
;; ;;
## SR2001/SR2201 running HI-UX/MPP
hppa1.1-hitachi-hiuxmpp* )
machine=sr2k opsys=hiuxmpp
;;
hppa1.1-hitachi-hiuxwe2* )
machine=sr2k opsys=hiuxwe2
;;
## Honeywell XPS100 ## Honeywell XPS100
xps*-honeywell-sysv* ) xps*-honeywell-sysv* )
machine=xps100 opsys=usg5-2 machine=xps100 opsys=usg5-2
@ -623,46 +616,10 @@ dnl see the `changequote' comment above.
esac esac
;; ;;
## HP 9000 series 700 and 800, running HP/UX
hppa*-hp-hpux7* )
machine=hp800 opsys=hpux
;;
hppa*-hp-hpux8* )
machine=hp800 opsys=hpux8
;;
hppa*-hp-hpux9shr* )
machine=hp800 opsys=hpux9shr
;;
hppa*-hp-hpux9* )
machine=hp800 opsys=hpux9
;;
hppa*-hp-hpux10.2* )
machine=hp800 opsys=hpux10-20
;;
hppa*-hp-hpux10* )
machine=hp800 opsys=hpux10
;;
hppa*-hp-hpux1[1-9]* )
machine=hp800 opsys=hpux11
CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
;;
hppa*-*-linux-gnu* ) hppa*-*-linux-gnu* )
machine=hp800 opsys=gnu-linux machine=hp800 opsys=gnu-linux
;; ;;
## HP 9000 series 700 and 800, running HP/UX
hppa*-hp-hpux* )
## Cross-compilation? Nah!
case "`uname -r`" in
## Someone's system reports A.B8.05 for this.
## I wonder what other possibilities there are.
*.B8.* ) machine=hp800 opsys=hpux8 ;;
*.08.* ) machine=hp800 opsys=hpux8 ;;
*.09.* ) machine=hp800 opsys=hpux9 ;;
*) machine=hp800 opsys=hpux10 ;;
esac
;;
hppa*-*-nextstep* ) hppa*-*-nextstep* )
machine=hp800 opsys=nextstep machine=hp800 opsys=nextstep
;; ;;

View file

@ -1,3 +1,17 @@
2007-01-20 Glenn Morris <rgm@gnu.org>
* orgcard.tex: Remove for legal reasons.
* orgcard.ps: Remove for legal reasons.
2007-01-27 Kevin Rodgers <kevin.d.rodgers@gmail.com>
* PROBLEMS: More details about disabling features that hamper
performance with slow X connections.
2007-01-26 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* ps-prin1.ps (printBackground): Fix background height.
2007-01-20 Glenn Morris <rgm@gnu.org> 2007-01-20 Glenn Morris <rgm@gnu.org>
* cd-dired-ref.tex (versionemacs): New def. * cd-dired-ref.tex (versionemacs): New def.

View file

@ -195,6 +195,10 @@ See the files mac/README and mac/INSTALL for build instructions.
--- ---
** Support for GNU/Linux systems on X86-64 machines was added. ** Support for GNU/Linux systems on X86-64 machines was added.
---
** Support for HP 9000 series 800 and Hitachi SR2001/SR2201 machines
was removed.
--- ---
** Mac OS 9 port now uses the Carbon API by default. You can also ** Mac OS 9 port now uses the Carbon API by default. You can also
create non-Carbon build by specifying `NonCarbon' as a target. See create non-Carbon build by specifying `NonCarbon' as a target. See

View file

@ -1,5 +1,5 @@
GNU Emacs NEWS -- history of user-visible changes. 26-Mar-1986 GNU Emacs NEWS -- history of user-visible changes. 26-Mar-1986
Copyright (C) 1985, 1986, 2006, 2007 Richard M. Stallman. Copyright (C) 1985, 1986, 2006, 2007 Free Software Foundation, Inc.
See the end for copying conditions. See the end for copying conditions.
This file is about changes in emacs versions 1 through 17. This file is about changes in emacs versions 1 through 17.
@ -2511,7 +2511,7 @@ Lisp programming changes
---------------------------------------------------------------------- ----------------------------------------------------------------------
Copyright information: Copyright information:
Copyright (C) 1985, 1986, 2006, 2007 Richard M. Stallman Copyright (C) 1985, 1986, 2006, 2007 Free Software Foundation, Inc.
Permission is granted to anyone to make or distribute verbatim copies Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the of this document as received, in any medium, provided that the

View file

@ -1267,7 +1267,20 @@ be carried out at the same time:
package. package.
2) If the connection is very slow, you might also want to consider 2) If the connection is very slow, you might also want to consider
switching off scroll bars, menu bar, and tool bar. switching off scroll bars, menu bar, and tool bar. Adding the
following forms to your .emacs file will accomplish that, but only
after the the initial frame is displayed:
(scroll-bar-mode -1)
(menu-bar-mode -1)
(tool-bar-mode -1)
For still quicker startup, put these X resources in your .Xdefaults
file:
Emacs.verticalScrollBars: off
Emacs.menuBar: off
Emacs.toolBar: off
3) Use ssh to forward the X connection, and enable compression on this 3) Use ssh to forward the X connection, and enable compression on this
forwarded X connection (ssh -XC remotehostname emacs ...). forwarded X connection (ssh -XC remotehostname emacs ...).

View file

@ -823,7 +823,8 @@ G-C-\: Split Window | FNDNXT | Yank | CUT |
;;; ;;;
;;; For GNU Emacs 19 and Above ;;; For GNU Emacs 19 and Above
;;; ;;;
;; Copyright (C) 1986, 1992, 1993, 2000 Free Software Foundation, Inc. ;; Copyright (C) 1986, 1992, 1993, 2000, 2001, 2002, 2003, 2004, 2005,
;; 2006, 2007 Free Software Foundation, Inc.
;; Author: Kevin Gallagher <kgallagh@spd.dsccc.com> ;; Author: Kevin Gallagher <kgallagh@spd.dsccc.com>
;; Maintainer: Kevin Gallagher <kgallagh@spd.dsccc.com> ;; Maintainer: Kevin Gallagher <kgallagh@spd.dsccc.com>

View file

@ -1,17 +1,41 @@
# This defines a bash command named `edit' which contacts/resumes an ### emacs.bash --- contact/resume an existing Emacs, or start a new one
# existing emacs or starts a new one if none exists.
# ## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
# One way or another, any arguments are passed to emacs to specify files ## Free Software Foundation, Inc.
# (provided you have loaded `resume.el').
# ## Author: Noah Friedman
# This function assumes the emacs program is named `emacs' and is somewhere
# in your load path. If either of these is not true, the most portable ## This file is part of GNU Emacs.
# (and convenient) thing to do is to make an alias called emacs which
# refers to the real program, e.g. ## 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
# alias emacs=/usr/local/bin/gemacs ## the Free Software Foundation; either version 2, or (at your option)
# ## any later version.
# Written by Noah Friedman.
## 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., 51 Franklin Street, Fifth Floor,
## Boston, MA 02110-1301, USA.
### Commentary:
## This defines a bash command named `edit' which contacts/resumes an
## existing emacs or starts a new one if none exists.
## One way or another, any arguments are passed to emacs to specify files
## (provided you have loaded `resume.el').
## This function assumes the emacs program is named `emacs' and is somewhere
## in your load path. If either of these is not true, the most portable
## (and convenient) thing to do is to make an alias called emacs which
## refers to the real program, e.g.
##
## alias emacs=/usr/local/bin/gemacs
function edit () function edit ()
{ {
@ -44,3 +68,4 @@ function edit ()
# arch-tag: 1e1b74b9-bf2c-4b23-870f-9eebff7515cb # arch-tag: 1e1b74b9-bf2c-4b23-870f-9eebff7515cb
### emacs.bash ends here

File diff suppressed because it is too large Load diff

View file

@ -1,754 +0,0 @@
% Reference Card for Org Mode
\def\orgversionnumber{4.56}
\def\versionyear{2006} % latest update
\def\year{2007} % latest copyright year
%
%**start of header
\newcount\columnsperpage
% This file can be printed with 1, 2, or 3 columns per page (see below).
% At the moment this card works quite nicely in 3 column format and
% currently takes 2 full pages. It is thus suited to producing one
% double-side page when printed.
% There are a couple of tweaks in the format of this card which make it work
% slightly better on A4 paper. The changes due, I think, to Stephen Eglen,
% are commented below. Revert the changes if you want letter sized paper.
% Try running something like
% tex org-mode-ref.tex; dvips -t landscape org-mode-ref.dvi
% to print the card
\columnsperpage=3
% Copyright (C) 2004 Philip Rooke
% Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
% FIXME - no Rooke in copyright.list
% 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.
% This file is intended to be processed by plain TeX (TeX82).
%
% The final reference card has six columns, three on each side.
% This file can be used to produce it in any of three ways:
% 1 column per page
% produces six separate pages, each of which needs to be reduced to 80%.
% This gives the best resolution.
% 2 columns per page
% produces three already-reduced pages.
% You will still need to cut and paste.
% 3 columns per page
% produces two pages which must be printed sideways to make a
% ready-to-use 8.5 x 11 inch reference card.
% For this you need a dvi device driver that can print sideways.
% Which mode to use is controlled by setting \columnsperpage above.
%
% Author:
% Stephen Gildea
% Internet: gildea@stop.mail-abuse.org
%
% Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
% for their many good ideas.
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
\centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
Permissions on back. v\orgversionnumber}}
\def\copyrightnotice{
\vskip 1ex plus 100 fill\begingroup\small
\centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
\centerline{v\orgversionnumber{} for Org-Mode \orgversionnumber{}, \versionyear}
\centerline{Author: Philip Rooke}
\centerline{based on refcard design and format by Stephen Gildea}
Permission is granted to make and distribute copies of
this card provided the copyright notice and this permission notice
are preserved on all copies.
\endgroup}
% make \bye not \outer so that the \def\bye in the \else clause below
% can be scanned without complaint.
\def\bye{\par\vfill\supereject\end}
\newdimen\intercolumnskip %horizontal space between columns
\newbox\columna %boxes to hold columns already built
\newbox\columnb
\def\ncolumns{\the\columnsperpage}
\message{[\ncolumns\space
column\if 1\ncolumns\else s\fi\space per page]}
\def\scaledmag#1{ scaled \magstep #1}
% This multi-way format was designed by Stephen Gildea October 1986.
% Note that the 1-column format is fontfamily-independent.
\if 1\ncolumns %one-column format uses normal size
\hsize 4in
\vsize 10in
\voffset -.7in
\font\titlefont=\fontname\tenbf \scaledmag3
\font\headingfont=\fontname\tenbf \scaledmag2
\font\smallfont=\fontname\sevenrm
\font\smallsy=\fontname\sevensy
\footline{\hss\folio}
\def\makefootline{\baselineskip10pt\hsize6.5in\line{\the\footline}}
\else %2 or 3 columns uses prereduced size
\hsize 3.2in
% FIXME - Try to make things more A4 friendly
% \vsize 7.95in
\vsize 7.65in
% \hoffset -.75in
\hoffset -.25in
\voffset -.745in
\font\titlefont=cmbx10 \scaledmag2
\font\headingfont=cmbx10 \scaledmag1
\font\smallfont=cmr6
\font\smallsy=cmsy6
\font\eightrm=cmr8
\font\eightbf=cmbx8
\font\eightit=cmti8
\font\eighttt=cmtt8
\font\eightmi=cmmi8
\font\eightsy=cmsy8
\textfont0=\eightrm
\textfont1=\eightmi
\textfont2=\eightsy
\def\rm{\eightrm}
\def\bf{\eightbf}
\def\it{\eightit}
\def\tt{\eighttt}
% FIXME - Try to make things more A4 friendly
% \normalbaselineskip=.8\normalbaselineskip
\normalbaselineskip=.7\normalbaselineskip
\normallineskip=.8\normallineskip
\normallineskiplimit=.8\normallineskiplimit
\normalbaselines\rm %make definitions take effect
\if 2\ncolumns
\let\maxcolumn=b
\footline{\hss\rm\folio\hss}
\def\makefootline{\vskip 2in \hsize=6.86in\line{\the\footline}}
\else \if 3\ncolumns
\let\maxcolumn=c
\nopagenumbers
\else
\errhelp{You must set \columnsperpage equal to 1, 2, or 3.}
\errmessage{Illegal number of columns per page}
\fi\fi
\intercolumnskip=.46in
\def\abc{a}
\output={% %see The TeXbook page 257
% This next line is useful when designing the layout.
%\immediate\write16{Column \folio\abc\space starts with \firstmark}
\if \maxcolumn\abc \multicolumnformat \global\def\abc{a}
\else\if a\abc
\global\setbox\columna\columnbox \global\def\abc{b}
%% in case we never use \columnb (two-column mode)
\global\setbox\columnb\hbox to -\intercolumnskip{}
\else
\global\setbox\columnb\columnbox \global\def\abc{c}\fi\fi}
\def\multicolumnformat{\shipout\vbox{\makeheadline
\hbox{\box\columna\hskip\intercolumnskip
\box\columnb\hskip\intercolumnskip\columnbox}
\makefootline}\advancepageno}
\def\columnbox{\leftline{\pagebody}}
\def\bye{\par\vfill\supereject
\if a\abc \else\null\vfill\eject\fi
\if a\abc \else\null\vfill\eject\fi
\end}
\fi
% we won't be using math mode much, so redefine some of the characters
% we might want to talk about
%\catcode`\^=12
\catcode`\_=12
% we also need the tilde, for file names.
\catcode`\~=12
\chardef\\=`\\
\chardef\{=`\{
\chardef\}=`\}
\hyphenation{mini-buf-fer}
\parindent 0pt
\parskip 1ex plus .5ex minus .5ex
\def\small{\smallfont\textfont2=\smallsy\baselineskip=.8\baselineskip}
% newcolumn - force a new column. Use sparingly, probably only for
% the first column of a page, which should have a title anyway.
\outer\def\newcolumn{\vfill\eject}
% title - page title. Argument is title text.
\outer\def\title#1{{\titlefont\centerline{#1}}\vskip 1ex plus .5ex}
% section - new major section. Argument is section name.
\outer\def\section#1{\par\filbreak
\vskip 3ex plus 2ex minus 2ex {\headingfont #1}\mark{#1}%
\vskip 2ex plus 1ex minus 1.5ex}
\newdimen\keyindent
% beginindentedkeys...endindentedkeys - key definitions will be
% indented, but running text, typically used as headings to group
% definitions, will not.
\def\beginindentedkeys{\keyindent=1em}
\def\endindentedkeys{\keyindent=0em}
\endindentedkeys
% paralign - begin paragraph containing an alignment.
% If an \halign is entered while in vertical mode, a parskip is never
% inserted. Using \paralign instead of \halign solves this problem.
\def\paralign{\vskip\parskip\halign}
% \<...> - surrounds a variable name in a code example
\def\<#1>{{\it #1\/}}
% kbd - argument is characters typed literally. Like the Texinfo command.
\def\kbd#1{{\tt#1}\null} %\null so not an abbrev even if period follows
% beginexample...endexample - surrounds literal text, such a code example.
% typeset in a typewriter font with line breaks preserved
\def\beginexample{\par\leavevmode\begingroup
\obeylines\obeyspaces\parskip0pt\tt}
{\obeyspaces\global\let =\ }
\def\endexample{\endgroup}
% key - definition of a key.
% \key{description of key}{key-name}
% prints the description left-justified, and the key-name in a \kbd
% form near the right margin.
\def\key#1#2{\leavevmode\hbox to \hsize{\vtop
{\hsize=.75\hsize\rightskip=1em
\hskip\keyindent\relax#1}\kbd{#2}\hfil}}
\newbox\metaxbox
\setbox\metaxbox\hbox{\kbd{M-x }}
\newdimen\metaxwidth
\metaxwidth=\wd\metaxbox
% metax - definition of a M-x command.
% \metax{description of command}{M-x command-name}
% Tries to justify the beginning of the command name at the same place
% as \key starts the key name. (The "M-x " sticks out to the left.)
\def\metax#1#2{\leavevmode\hbox to \hsize{\hbox to .75\hsize
{\hskip\keyindent\relax#1\hfil}%
\hskip -\metaxwidth minus 1fil
\kbd{#2}\hfil}}
% threecol - like "key" but with two key names.
% for example, one for doing the action backward, and one for forward.
\def\threecol#1#2#3{\hskip\keyindent\relax#1\hfil&\kbd{#2}\hfil\quad
&\kbd{#3}\hfil\quad\cr}
%**end of header
\title{Org-Mode Reference Card (1/2)}
\centerline{(for version \orgversionnumber)}
\section{Getting Started}
%
\vskip -1mm
\beginexample%
(add-to-list 'auto-mode-alist '("\\\\.org\$" . org-mode))
(define-key global-map "\\C-cl" 'org-store-link)$^1$
(define-key global-map "\\C-ca" 'org-agenda)$^1$
\endexample
%
\metax{For the many customization options try}{M-x org-customize}
\metax{To read the on-line documentation try}{M-x org-info}
\section{Visibility Cycling}
\key{rotate current subtree between states}{TAB}
\key{rotate entire buffer between states}{S-TAB}
\key{show the whole file}{C-c C-a}
\key{reveal context around point}{C-c C-r}
%\key{show branches}{C-c C-k}
\section{Motion}
\key{next/previous heading}{C-c C-n/p}
\key{next/previous heading, same level}{C-c C-f/b}
\key{backward to higher level heading}{C-c C-u}
\key{jump to another place in document}{C-c C-j}
\key{previous/next plain list item}{S-UP/DOWN$^3$}
\section{Structure Editing}
\key{insert new heading/item at current level}{M-RET}
\key{insert new TODO entry/checkbox item}{M-S-RET}
\key{promote current heading up one level}{M-LEFT}
\key{demote current heading down one level}{M-RIGHT}
\key{promote current subtree up one level}{M-S-LEFT}
\key{demote current subtree down one level}{M-S-RIGHT}
\key{move subtree/list item up/down}{M-S-UP/DOWN}
\key{kill subtree}{C-c C-x C-w}
\key{copy subtree}{C-c C-x M-w}
\key{yank subtree}{C-c C-x C-y}
\key{narrow buffer to current subtree}{C-x n s}
\section{Archiving}
\key{toggle ARCHIVE tag}{C-c C-x C-a}
\metax{mark fully done children}{C-u C-c C-x C-a}
\key{force cycling of an ARCHIVEd tree}{C-TAB}
\key{move subtree to archive file}{C-c \$}
\key{move all fully done children}{C-u C-c \$}
To set archive location for current file, add a line like$^2$:
\vskip -1mm
\beginexample%
\#+ARCHIVE: archfile::* Archived Tasks
\endexample
\section{Filtering and Sparse Trees}
\key{show sparse tree for all matches of a regexp}{C-c /}
\key{view TODO's in sparse tree}{C-c C-v}
\key{global TODO list in agenda mode}{C-c t$^1$}
\key{create sparse tree with all deadlines due}{C-c C-w}
\key{time sorted view of current org file}{C-c a L}
%\key{agenda for the week}{C-c a$^1$}
%\key{agenda for date at cursor}{C-c C-o}
\section{Tables}
{\bf Creating a table}
%\metax{insert a new Org-mode table}{M-x org-table-create}
\metax{just start typing, e.g.}{|Name|Phone|Age RET |- TAB}
\key{convert region to table}{C-c |}
\key{... separator at least 3 spaces}{C-3 C-c |}
{\bf Commands available inside tables}
The following commands work when the cursor is {\it inside a table}.
Outside of tables, the same keys may have other functionality.
{\bf Re-aligning and field motion}
\key{re-align the table without moving the cursor}{C-c C-c}
\key{re-align the table, move to next field}{TAB}
\key{move to previous field}{S-TAB}
\key{re-align the table, move to next row}{RET}
{\bf Row and column editing}
\key{move the current column left}{M-LEFT}
\key{move the current column right}{M-RIGHT}
\key{kill the current column}{M-S-LEFT}
\key{insert new column to left of cursor position}{M-S-RIGHT}
\key{move the current row up}{M-UP}
\key{move the current row down}{M-DOWN}
\key{kill the current row or horizontal line}{M-S-UP}
\key{insert new row above the current row}{M-S-DOWN}
\key{insert horizontal line below the current row}{C-c -}
\key{insert horizontal line above the current row}{C-u C-c -}
\key{sort lines in region}{C-c \^{}}
{\bf Regions}
\key{cut rectangular region}{C-c C-x C-w}
\key{copy rectangular region}{C-c C-x M-w}
\key{paste rectangular region}{C-c C-x C-y}
\key{fill paragraph across selected cells}{C-c C-q}
{\bf Calculations} (in combination with Emacs \kbd{calc} package)
\key{set and eval column formula}{C-c =}
\key{set and eval named-field formula}{C-u C-c =}
\key{edit formulas in separate buffer}{C-c '}
\key{re-apply all stored equations to current line}{C-c *}
\key{re-apply all stored equations to entire table}{C-u C-c *}
%\kbd{TAB}, \kbd{RET} and \kbd{C-c C-c} trigger automatic recalculation
%in lines starting with: {\tt | \# |}.
\key{rotate calculation mark through \# * ! \^ \_ \$}{C-\#}
\key{display column number cursor is in}{C-c ?}
\key{sum numbers in current column/rectangle}{C-c +}
\key{copy down with increment}{S-RET$^3$}
Formulas typed in field are executed by \kbd{TAB},
\kbd{RET} and \kbd{C-c C-c}. \kbd{=} introduces a column
formula, \kbd{:=} a named-field formula.
\key{Example: Add Col1 and Col2}{=\$1+\$2}
\key{... with printf format specification}{=\$1+\$2;\%.2f}
\key{... with constants from constants.el}{=\$1/\$c/\$cm}
\key{sum from 3rd hline above to here}{:=vsum(\&III)}
\key{apply current column formula}{=}
{\bf Miscellaneous}
\key{to limit column width to \kbd{N} characters, use}{...| <N> |...}
\key{edit the current field in a separate window}{C-c `}
\key{make current field fully visible}{C-u TAB}
\metax{export as tab-separated file}{M-x org-table-export}
\metax{import tab-separated file}{M-x org-table-import}
{\bf Tables created with the \kbd{table.el} package}
\key{insert a new \kbd{table.el} table}{C-c ~}
\key{recognize existing table.el table}{C-c C-c}
\key{convert table (Org-mode $\leftrightarrow$ table.el)}{C-c ~}
\section{Links}
\key{globally store link to the current location}{C-c l$^1$}
\key{insert a link (TAB completes stored links)}{C-c C-l}
\key{insert file link with file name completion}{C-u C-c C-l}
\key{edit (also hidden part of) link at point}{C-c C-l}
\key{open file links in emacs}{C-c C-o}
\key{...force open in emacs/other window}{C-u C-c C-o}
\key{open link at point}{mouse-1/2}
\key{...force open in emacs/other window}{mouse-3}
\key{record a position in mark ring}{C-c \%}
\key{jump back to last followed link(s)}{C-c \&}
{\bf Internal Links}
\key{\kbd{<<My Target>>}}{\rm target}
\key{\kbd{<<<My Target>>>}}{\rm radio target$^2$}
\key{\kbd{[[*this text]]}}{\rm find headline}
\metax{\kbd{[[this text]]}}{\rm find target or text in buffer}
\metax{\kbd{[[this text][description]]}}{\rm optional link text}
{\bf External Links}
\key{\kbd{file:/home/dominik/img/mars.jpg}}{\rm file, absolute}
\key{\kbd{file:papers/last.pdf}}{\rm file, relative}
\key{\kbd{file:projects.org::*that text}}{\rm find headline}
\key{\kbd{file:projects.org::find me}}{\rm find trgt/string}
%\key{\kbd{file:projects.org::/regexp/}}{\rm regexp search}
\key{\kbd{http://www.astro.uva.nl/~dominik}}{\rm on the web}
\key{\kbd{mailto:adent@galaxy.net}}{\rm Email address}
\key{\kbd{news:comp.emacs}}{\rm Usenet group}
\key{\kbd{bbdb:Richard Stallman}}{\rm BBDB person}
\key{\kbd{gnus:group}}{\rm GNUS group}
\key{\kbd{gnus:group\#id}}{\rm GNUS message}
\key{\kbd{vm|wl|mhe|rmail:folder}}{\rm Mail folder}
\key{\kbd{vm|wl|mhe|rmail:folder\#id}}{\rm Mail message}
\key{\kbd{info:emacs:Regexps}}{\rm Info file:node}
\key{\kbd{shell:ls *.org}}{\rm shell command}
\key{\kbd{elisp:(calendar)}}{\rm elisp form}
\metax{\kbd{[[external link][description]]}}{\rm optional link text}
%\key{\kbd{vm://myself@some.where.org/folder\#id}}{\rm VM remote}
\section{Remember-mode Integration}
See the manual for how to make remember.el use Org-mode links and
files. The note-finishing command \kbd{C-c C-c} will first prompt for
an org file. In the file, find a location with:
\key{rotate subtree visibility}{TAB}
\key{next heading}{DOWN}
\key{previous heading}{UP}
Insert the note with one of the following:
\key{as sublevel of heading at cursor}{RET}
\key{right here (cursor not on heading)}{RET}
\key{before current heading}{LEFT}
\key{after current heading}{RIGHT}
\key{shortcut to end of buffer (cursor at buf-start)}{RET}
\key{Abort}{q}
\section{Completion}
In-buffer completion completes TODO keywords at headline start, TeX
macros after ``{\tt \\}'', option keywords after ``{\tt \#-}'', TAGS
after ``{\tt :}'', and dictionary words elsewhere.
\key{Complete word at point}{M-TAB}
\newcolumn
\title{Org-Mode Reference Card (2/2)}
\centerline{(for version \orgversionnumber)}
\section{TODO Items and Checkboxes}
\key{rotate the state of the current item}{C-c C-t}
\key{view TODO items in a sparse tree}{C-c C-v}
\key{view 3rd TODO keyword's sparse tree}{C-3 C-c C-v}
\key{set the priority of the current item}{C-c , [ABC]}
\key{remove priority cookie from current item}{C-c , SPC}
\key{raise priority of current item}{S-UP$^3$}
\key{lower priority of current item}{S-DOWN$^3$}
\key{\kbd{\#+SEQ_TODO: TODO TRY BLUFF DONE}}{\rm todo workflow}
\key{\kbd{\#+TYP_TODO: Phil home work DONE}}{\rm todo types}
\key{insert new checkbox item in plain list}{M-S-RET}
\key{toggle checkbox(es) in region/entry/at point}{C-c C-x C-b}
\key{toggle checkbox at point}{C-c C-c}
\metax{checkbox statistics cookies: insert {\tt [/]} or {\tt [\%]}}{}
\key{update checkbox statistics (\kbd{C-u} : whole file)}{C-c \#}
\section{Tags}
\key{set tags for current heading}{C-c C-c}
\key{realign tags in all headings}{C-u C-c C-c}
\key{create sparse tree with matching tags}{C-c \\}
\key{globally (agenda) match tags at cursor}{C-c C-o}
\section{Timestamps}
\key{prompt for date and insert timestamp}{C-c .}
\key{like \kbd{C-c} . but insert date and time format}{C-u C-c .}
\key{Like \kbd{C-c .} but make stamp inactive}{C-c !} % FIXME
\key{insert DEADLINE timestamp}{C-c C-d}
\key{insert SCHEDULED timestamp}{C-c C-s}
\key{create sparse tree with all deadlines due}{C-c C-w}
\key{the time between 2 dates in a time range}{C-c C-y}
\key{change timestamp at cursor by $\pm 1$ day}{S-RIGHT/LEFT$^3$}
\key{change year/month/day at cursor by $\pm 1$}{S-UP/DOWN$^3$}
\key{access the calendar for the current date}{C-c >}
\key{insert timestamp matching date in calendar}{C-c <}
\key{access agenda for current date}{C-c C-o}
\key{Select date while prompted}{mouse-1/RET}
%\key{... select date in calendar}{mouse-1/RET}
%\key{... scroll calendar back/forward one month}{< / >}
%\key{... forward/backward one day}{S-LEFT/RIGHT}
%\key{... forward/backward one week}{S-UP/DOWN}
%\key{... forward/backward one month}{M-S-LEFT/RIGT}
\key{Toggle custom format display for dates/times}{C-c C-x C-t}
\section{Clocking Time}
\key{start clock on current item}{C-c C-x C-i}
\key{stop clock on current item}{C-c C-x C-o}
\key{cancel current clock}{C-c C-x C-x}
\key{display total subtree times}{C-c C-x C-d}
\key{remove displayed times}{C-c C-c}
\key{insert/update table with clock report}{C-c C-x C-r}
\section{LaTeX and cdlatex-mode}
\key{preview LaTeX fragment}{C-c C-x C-l}
\key{Expand abbreviation (cdlatex-mode)}{TAB}
\key{Insert/modify math symbol (cdlatex-mode)}{` / '}
\section{Agenda Views}
\key{add/move current file to front of agenda}{C-c [}
\key{remove current file from your agenda}{C-c ]}
\key{cycle through agenda file list}{C-,}
\key{compile agenda for the current week}{C-c a a$^1$}
\key{compile global TODO list}{C-c a t$^1$}
\key{compile TODO list for specific keyword}{C-c a T$^1$}
\key{match tags in agenda files}{C-c a m$^1$}
\key{match tags in TODO entries}{C-c a M$^1$}
\key{show timeline of current org file}{C-c a L$^1$}
\key{configure custom commands}{C-c a C$^1$}
\key{agenda for date at cursor}{C-c C-o}
\vskip 1mm
To set categories, add lines like$^2$:
\vskip -1mm
\beginexample%
\#+CATEGORY: MyCateg
\endexample
{\bf Commands available in an agenda buffer}
{\bf View Org file}
\key{show original location of item}{SPC/mouse-3}
%\key{... also available with}{mouse-3}
\key{show and recenter window}{L}
\key{goto original location in other window}{TAB/mouse-2}
%\key{... also available with}{mouse-2}
\key{goto original location, delete other windows}{RET}
\key{toggle follow-mode}{f}
{\bf Change display}
\key{delete other windows}{o}
\key{switch to daily / weekly view}{d / w}
\key{toggle inclusion of diary entries}{D}
\key{toggle time grid for daily schedule}{g}
\key{toggle display of logbook entries}{l}
\key{refresh agenda buffer with any changes}{r}
\key{save all org-mode buffers}{s}
\key{display the following \kbd{org-agenda-ndays}}{RIGHT}
\key{display the previous \kbd{org-agenda-ndays}}{LEFT}
\key{goto today}{.}
{\bf Remote editing}
\key{digit argument}{0-9}
\key{change state of current TODO item}{t}
\key{kill item and source}{C-k}
\key{show tags of current headline}{T}
\key{set tags for current headline}{:}
\key{toggle ARCHIVE tag}{a}
\key{set priority of current item}{p}
\key{raise/lower priority of current item}{S-UP/DOWN$^3$}
\key{display weighted priority of current item}{P}
\key{schedule/set deadline for this item}{C-c C-s/d}
\key{change timestamp to one day earlier/later}{S-LEFT/RIGHT$^3$}
\key{change timestamp to today}{>}
\key{insert new entry into diary}{i}
\key{Start the clock on current item (clock-in)}{I}
\key{Stop the clock (clock-out)}{O}
\key{Cancel current clock}{X}
{\bf Calendar commands}
\key{find agenda cursor date in calendar}{c}
\key{compute agenda for calendar cursor date}{c}
\key{show phases of the moon}{M}
\key{show sunrise/sunset times}{S}
\key{show holidays}{H}
\key{convert date to other calendars}{C}
{\bf Quit and Exit}
\key{quit agenda, remove agenda buffer}{q}
\key{exit agenda, remove all agenda buffers}{x}
\section{Calendar and Diary Integration}
Include Emacs diary entries into Org-mode agenda with:
\beginexample%
(setq org-agenda-include-diary t)
\endexample
\section{Exporting and Publishing}
Exporting creates files with extensions {\it .txt\/} and {\it .html\/}
in the current directory. Publishing puts the resulting file into
some other place.
\key{export/publish dispatcher}{C-c C-e}
\key{export visible part only}{C-c C-e v}
\key{insert template of export options}{C-c C-x t}
\key{toggle fixed width for entry or region}{C-c :}
{\bf HTML formatting}
\key{make words {\bf bold}}{*bold*}
\key{make words {\it italic}}{/italic/}
\key{make words \underbar{underlined}}{_underlined_}
\key{sub- and superscripts}{x\^{}3, J_dust}
\key{\TeX{}-like macros}{\\alpha, \\to}
\key{typeset lines in fixed width font}{start with :}
\key{tables are exported as HTML tables}{start with |}
\key{links become HTML links}{http:... etc}
\key{include html tags}{@<b>...@</b>}
{\bf Export options}
Include additional information for export by putting these anywhere in the
org file. Use {\tt M-TAB} completion to make sure to get the right
keywords. {\tt M-TAB} again just after keyword is complete inserts examples.
\key{the title to be shown}{\#+TITLE:}
\key{the author}{\#+AUTHOR:}
\key{authors email address}{\#+EMAIL:}
\key{language code for html}{\#+LANGUAGE:}
\key{free text description of file}{\#+TEXT:}
\key{... which can carry over multiple lines}{\#+TEXT:}
%\key{settings for the export process - see below}{\#+OPTIONS:}
\key{settings for the export process}{\#+OPTIONS:}
%\key{set number of headline levels for export}{H:2}
%\key{turn on/off section numbers}{num:t}
%\key{turn on/off table of contents}{toc:t}
%\key{turn on/off linebreak preservation}{\\n:nil}
%\key{turn on/off quoted html tags}{@:t}
%\key{turn on/off fixed width sections}{::t}
%\key{turn on/off tables}{|:t}
%\key{turn on/off \TeX\ syntax for sub/super-scripts}{\^{}:t}
%\key{turn on/off emphasised text}{*:nil}
%\key{turn on/off \TeX\ macros}{TeX:t}
{\bf Comments: Text not being exported}
Text before the first headline is not considered part of the document
and is therefore never exported.
Lines starting with \kbd{\#} are comments and are not exported.
Subtrees whose header starts with COMMENT are never exported.
\key{toggle COMMENT keyword on entry}{C-c ;}
%\section{CUA and pc-select compatibility}%
%Configure the variable {\tt org-CUA-compatibility} to make Org-mode
%avoid the \kbd{S-<cursor>} bindings used by these modes. When set,
%Org-mode will change the following keybindings (also in the agenda
%buffer, but not during date selection). See note mark four$^3$
%throughout the reference card.
%%\vskip-mm
%\beginexample
%S-UP $\to$ M-p S-DOWN $\to$ M-n
%S-LEFT $\to$ M-- S-RIGHT $\to$ M-+
%S-RET $\to$ C-S-RET
%\endexample
\section{Dynamic Blocks}
\key{update dynamic block at point}{C-c C-x C-u}
\metax{update all dynamic blocks}{C-u C-c C-x C-u}
\section{Notes}
$^1$ This is only a suggestion for a binding of this command. Choose
you own key as shown under INSTALLATION.
$^2$ After changing a \kbd{\#+KEYWORD} or \kbd{<<<target>>>} line,
press \kbd{C-c C-c} with the cursor still in the line to update.
$^3$ Keybinding affected by {\tt org-CUA-compatibility}.
\copyrightnotice
\bye
% arch-tag: 139f6750-5cfc-49ca-92b5-237fe5795290
%%% Local Variables:
%%% mode: latex
%%% TeX-master: t
%%% End:

Binary file not shown.

View file

@ -1,58 +1,35 @@
All *.tit files in this directory are dictionary files to use with All *.tit files in this directory are dictionary files to use with
the program cxterm. Their source and copyright status are categorised the program cxterm. Their source and copyright status are categorised
into these four. into these four groups.
(1) QJ-b5.tit (renamed from .../cxterm/dict/big5/QJ.tit) (1) QJ-b5.tit (renamed from .../cxterm/dict/big5/QJ.tit)
QJ.tit (copied from .../cxterm/dict/gb/QJ.tit) QJ.tit (copied from .../cxterm/dict/gb/QJ.tit)
These are verbatim copies of what included in the directory They are verbatim copies of those included in the directory
contrib/clients/cxterm of the distribution of X11R6. Each file contrib/clients/cxterm of the distribution of X11R6. Each file
contains a copyright notice. contains a license notice.
(2) CCDOSPY.tit (copied from .../cxterm/dict/gb/CCDOSPY.tit) (2) CCDOSPY.tit (copied from .../cxterm/dict/gb/CCDOSPY.tit)
PY-b5.tit (renamed from .../cxterm/dict/big5/PY.tit) PY-b5.tit (renamed from .../cxterm/dict/big5/PY.tit)
SW.tit (copied from .../cxterm/dict/gb/SW.tit) SW.tit (copied from .../cxterm/dict/gb/SW.tit)
TONEPY.tit (copied from .../cxterm/dict/gb/TONEPY.tit) TONEPY.tit (copied from .../cxterm/dict/gb/TONEPY.tit)
These are verbatim copies of what included in the directory They are copies of those included in the directory
contrib/clients/cxterm of the distribution of X11R6. As those files contrib/clients/cxterm of the distribution of X11R6. As the original
themselves don't contain copyright notices, the section 6 of the file files don't contain copyright and license notices, a proper notice is
.../cxterm/README should cover them. extracted from .../cxterm/README and added at the head of each file.
============================================================
6. COPYRIGHTS AND TERMS
This copyright and permission notice outlines the rights and
restrictions covering most parts of this distribution of cxterm.
Cxterm is modified from xterm, which is copyrighted by MIT.
Some individual files are covered by other copyrights. Utils
parts are redistributed software covered by their own copyrights
and terms. Please see individual file's copyright notices.
X11R6 CXTERM (C) 1994 BY YONGGUANG ZHANG.
X11R5 CXTERM (C) 1991 BY YONGGUANG ZHANG AND MAN-CHI PONG.
Permission to use, copy, modify, and distribute this software and
its documentation for any purpose is hereby granted without fee,
provided that this entire copyright and permission notice appear
in all such copies, and that the name of the authors may not be
used to endorse or promote products derived from this material
without specific prior written permission. The authors make no
representations about the suitability of this software for any
purpose. It is provided "as is" without express or implied warranty.
============================================================
(3) 4Corner.tit (3) 4Corner.tit
ARRAY30.tit ARRAY30.tit
ETZY.tit ETZY.tit
ZOZY.tit ZOZY.tit
These are the versions modified by the original authors from what They are versions modified by the original authors from those
distributed with X11R5 to include proper copyright notices. Each file distributed with X11R5 to include proper copyright notices. Each file
contains a copyright notice. contains a license notice.
(4) ECDICT.tit, Punct-b5.tit, Punct.tit (4) ECDICT.tit, Punct-b5.tit, Punct.tit
These are verbatim copies of what distributed at They are verbatim copies of those distributed at
ftp://ftp.ifcss.org/pub/software/. Each file contains a copyright ftp://ftp.ifcss.org/pub/software/. Each file contains a license
notice. notice.

Binary file not shown.

Binary file not shown.

View file

@ -1,3 +1,11 @@
2007-01-30 Kenichi Handa <handa@m17n.org>
* CXTERM-DIC/CCDOSPY.tit, CXTERM-DIC/PY-b5.tit, CXTERM-DIC/SW.tit,
CXTERM-DIC/TONEPY.tit: Add copyright and license notices.
* MISC-DIC/pinyin.map, MISC-DIC/ziranma.cin: Add copyright and
license notices.
2007-01-24 Kenichi Handa <handa@m17n.org> 2007-01-24 Kenichi Handa <handa@m17n.org>
* MISC-DIC/README: New file. * MISC-DIC/README: New file.

View file

@ -1,46 +1,27 @@
The source and copyright status of dictionary files in this directory The source and copyright status of dictionary files in this directory
are categorised into these three. are categorised into these three groups.
(1) cangjie-table.b5 (1) cangjie-table.b5
cangjie-table.cns cangjie-table.cns
These are verbatim copies of what distributed by the author Christian They are verbatim copies of those distributed by the author Christian
Wittern himself. Each file contains a copyright notice. Wittern himself. Each file contains a license notice.
(2) CTLau.html (2) CTLau.html
CTLau-b5.html CTLau-b5.html
These are verbatim copies of what distributed at the authors home page They are verbatim copies of those distributed at the author's home
<umunhum.stanford.edu/~lee/chicomp/> Each file contains a copyright page <umunhum.stanford.edu/~lee/chicomp/>. Each file contains a
notice. license notice.
(3) pinyin.map (3) pinyin.map
ziranma.cin ziranma.cin
These are verbatim copies of what distributed with a free packaged They are copies of those distributed with a free package
called CCE at: called CCE at:
http://ftp.debian.org/debian/dists/potato/main http://ftp.debian.org/debian/dists/potato/main
/source/utils/cce_0.36.orig.tar.gz /source/utils/cce_0.36.orig.tar.gz
As those files themselves don't contain copyright notices, the As the original files don't contain copyright and license notices, a
copyright notice of the package itself should cover them. proper notice is extracted from the file Copyright and added at the
head of each file.
============================================================
Copyright (C) 1999, Rui He, herui@cs.duke.edu
CCE(Console Chinese Environment) 0.32
CCE 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 1, or (at your option) any later version.
CCE 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
CCE; see the file COPYING. If not, write to the Free Software Foundation,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.")
============================================================

Binary file not shown.

Binary file not shown.

View file

@ -1,4 +1,4 @@
The file SKK-JISYO.L is a verbatim copy of what distributed with SKK The file SKK-JISYO.L is a verbatim copy of that distributed with SKK
Ver.8.6. The author of SKK is Masahiko Sato Ver.8.6. The author of SKK is Masahiko Sato
<masahiko@sato.riec.tohoku.ac.jp>. SKK is free software distributed <masahiko@sato.riec.tohoku.ac.jp>. SKK is free software distributed
under the terms of the GNU General Public License. under the terms of the GNU General Public License.

View file

@ -1,6 +1,6 @@
;;; ja-dic.el --- dictionary for Japanese input method -*-coding: iso-2022-jp;-*- ;;; ja-dic.el --- dictionary for Japanese input method -*-coding: iso-2022-jp; byte-compile-disable-print-circle:t; -*-
;; Generated by the command `skkdic-convert' ;; Generated by the command `skkdic-convert'
;; Date: Wed Jan 24 15:18:03 2007 ;; Date: Mon Jan 29 12:08:57 2007
;; Original SKK dictionary file: ../SKK-DIC/SKK-JISYO.L ;; Original SKK dictionary file: ../SKK-DIC/SKK-JISYO.L
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.

View file

@ -2,6 +2,9 @@
# b2m.pl - Script to convert a Babyl file to an mbox file # b2m.pl - Script to convert a Babyl file to an mbox file
# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
# Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or # the Free Software Foundation; either version 2 of the License, or

View file

@ -1,3 +1,180 @@
2007-01-30 Michael Albinus <michael.albinus@gmx.de>
* files.el (get-free-disk-space): Return nil for remote
directories.
* net/ange-ftp.el (ange-ftp-ls): In case of wildcards, use "ls"
instead of "dir".
2007-01-30 Chong Yidong <cyd@stupidchicken.com>
* type-break.el (type-break-catch-up-event): New function.
(type-break-demo-hanoi, type-break-demo-life)
(type-break-demo-boring): Use it.
* image-mode.el (image-mode): Don't automatically view as image.
(image-toggle-display): Add `disabled' property.
2007-01-29 Juanma Barranquero <lekktu@gmail.com>
* isearchb.el (isearchb-iswitchb):
* ps-print.el (ps-build-face-reference):
* emacs-lisp/shadow.el (list-load-path-shadows):
* eshell/esh-cmd.el (eshell-rewrite-for-command):
* international/mule.el (find-auto-coding):
* mail/supercite.el (sc-attrib-selection-list):
* progmodes/cc-defs.el (c-emacs-features):
* progmodes/cc-vars.el (c-offsets-alist):
* progmodes/flymake.el
(flymake-init-create-temp-source-and-master-buffer-copy):
Fix typos in docstrings (some suggested by Chris Moore).
* progmodes/vhdl-mode.el (vhdl-components-package-name)
(vhdl-get-library-unit, vhdl-corresponding-begin)
(vhdl-skip-case-alternative, vhdl-backward-skip-label)
(vhdl-align-region-2, vhdl-electric-dash, vhdl-case-word)
(vhdl-hooked-abbrev, vhdl-hs-forward-sexp-func)
(vhdl-font-lock-match-item): Fix typos in docstrings.
(vhdl-get-library-unit, vhdl-get-block-state, vhdl-sort-alist)
(vhdl-set-offset, vhdl-fix-case-region-1, vhdl-scan-directory-contents)
(vhdl-speedbar-insert-project-hierarchy):
Improve argument/docstring consistency.
2007-01-29 Kenichi Handa <handa@m17n.org>
* international/titdic-cnv.el (py-converter): Fix previous change.
2007-01-29 Chong Yidong <cyd@stupidchicken.com>
* jka-compr.el (jka-compr-partial-uncompress)
(jka-compr-call-process): Rebind default-directory if it is
invalid. Suggested by Chris Moore.
* comint.el (comint-insert-input): Handle situation where the
selected buffer is not the clicked buffer.
2007-01-29 Kenichi Handa <handa@m17n.org>
* international/ja-dic-cnv.el (skkdic-convert):
Add byte-compile-disable-print-circle:t at the head.
* international/titdic-cnv.el (tit-process-header):
Add byte-compile-disable-print-circle:t at the head.
(miscdic-convert): Likewise.
(py-converter): Skip the header comments.
* emacs-lisp/bytecomp.el (byte-compile-disable-print-circle):
New variable.
(byte-compile-output-file-form): Bing print-circle to nil if
byte-compile-output-file-form is not nil.
(byte-compile-output-docform): Likewise.
2007-01-28 Kim F. Storm <storm@cua.dk>
* emulation/cua-base.el (cua-global-keymap, cua--region-keymap):
Declare earlier to avoid byte compiler warnings.
2007-01-28 Markus Triska <markus.triska@gmx.at>
* speedbar.el (speedbar-make-specialized-keymap): Doc fix.
2007-01-28 Chong Yidong <cyd@stupidchicken.com>
* play/gamegrid.el (gamegrid-kill-timer): Cancel timer directly.
(gamegrid-add-score-with-update-game-score-1): Allow local quits
when calling update-game-score program. Remove unnecessary
save-excursion.
* play/tetris.el (tetris-new-shape): Stop drawing if game is over.
2007-01-28 Nick Roberts <nickrob@snap.net.nz>
* progmodes/gdb-ui.el (gdb-breakpoint-regexp): Declare earlier to
avoid compiler warning.
(gdb-var-update-handler-1): Consider that the MI field `in_scope'
might have values other than "true" or "false".
2007-01-28 Richard Stallman <rms@gnu.org>
* textmodes/fill.el (fill-paragraph-function): Doc fix.
(fill-paragraph): Bind fill-paragraph-function to t to avoid recursion.
* emacs-lisp/pp.el (pp-eval-last-sexp): Don't eval here.
* image.el (image-type-header-regexps): Make GIF regex more specific.
* tutorial.el (tutorial--default-keys): Check M-DEL, not `M-backspace'.
Don't check `backspace'.
(tutorial--find-changed-keys): Look up bindings in a temp buffer
in Fundamental mode.
* startup.el (fancy-splash-text, normal-splash-screen):
Mention C-g.
* simple.el (eval-expression): Don't use eval-last-sexp-print-value
when inserting in buffer.
* vc-arch.el (vc-arch-file-id): Move with-current-buffer
inside the if.
2007-01-27 Richard Stallman <rms@gnu.org>
* obsolete/awk-mode.el (awk-font-lock-keywords): Add "do".
2007-01-27 Guanpeng Xu <herberteuler@hotmail.com>
* add-log.el (add-log-current-defun): Skip the semicolon ``;'' for
enum/union/struct/class definition.
Revert change to call `forward-sexp' multiple times.
2007-01-27 Chong Yidong <cyd@stupidchicken.com>
* files.el (hack-local-variables-confirm): Don't keep trying to
read an event from an empty kbd macro.
2007-01-27 Eli Zaretskii <eliz@gnu.org>
* server.el (server-start): Mention LEAVE-DEAD arg in the doc string.
2007-01-27 Ben North <ben@redfrontdoor.org>
* outline.el (outline-promote, outline-demote): Doc fix. Rename
the arg CHILDREN -> WHICH.
2007-01-27 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set
default-directory to a sane value when calling start-process.
2007-01-27 Eli Zaretskii <eliz@gnu.org>
* ls-lisp.el (ls-lisp-use-localized-time-format): New defcustom.
(ls-lisp-format-time-list): Doc fix. Mention
ls-lisp-use-localized-time-format.
(ls-lisp-format-time): Use ls-lisp-format-time-list if
ls-lisp-use-localized-time-format is non-nil, even if a valid
locale is defined.
2007-01-27 Juanma Barranquero <lekktu@gmail.com>
* jka-compr.el (jka-compr-shell): Doc fix.
* jka-cmpr-hook.el (jka-compr-compression-info-list): Doc fix.
2007-01-26 Vinicius Jose Latorre <viniciusjl@ig.com.br>
* ps-print.ps: Fix background height.
(ps-print-version): New version 6.7.2.
2007-01-26 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in (finder-data, custom-deps): Depend on
$(lisp)/loaddefs.el.
2007-01-24 Dan Nicolaescu <dann@ics.uci.edu>
* Makefile.in (custom-deps, finder-data): Add dependency to loaddefs.el.
2007-01-24 Miles Bader <miles@gnu.org> 2007-01-24 Miles Bader <miles@gnu.org>
* emacs-lisp/bytecomp.el (byte-compile-output-file-form) * emacs-lisp/bytecomp.el (byte-compile-output-file-form)
@ -26,7 +203,7 @@
* viper-keym.el (viper-insert-basic-map): Delete binding for S-TAB. * viper-keym.el (viper-insert-basic-map): Delete binding for S-TAB.
* ediff-util.el (ediff-clone-buffer-for-region-comparison): Change text * ediff-util.el (ediff-clone-buffer-for-region-comparison): Change text
of message. Activate mark. of message. Activate mark.
(ediff-activate-mark): Set transient-mark-mode to t. (ediff-activate-mark): Set transient-mark-mode to t.
* ediff.el (ediff-regions-wordwise, ediff-regions-linewise): Doc fix. * ediff.el (ediff-regions-wordwise, ediff-regions-linewise): Doc fix.
@ -38,7 +215,7 @@
2007-01-22 Kim F. Storm <storm@cua.dk> 2007-01-22 Kim F. Storm <storm@cua.dk>
* ido.el (ido-active): Add xemacs test from ido-minibuffer-setup. * ido.el (ido-active): Add XEmacs test from ido-minibuffer-setup.
(ido-initiate-auto-merge, ido-exhibit, ido-minibuffer-setup) (ido-initiate-auto-merge, ido-exhibit, ido-minibuffer-setup)
(ido-tidy): Use ido-active. (ido-tidy): Use ido-active.
@ -90,7 +267,7 @@
* ps-print.el: Handle frame parameters (background and/or foreground * ps-print.el: Handle frame parameters (background and/or foreground
colors) changing dynamically. Reported by Leo <sdl.web@gmail.com>. colors) changing dynamically. Reported by Leo <sdl.web@gmail.com>.
(ps-print-version): New Version 6.7.1. (ps-print-version): New version 6.7.1.
(ps-x-frame-property, ps-e-frame-parameter): New aliases. (ps-x-frame-property, ps-e-frame-parameter): New aliases.
(ps-frame-parameter): New fun. (ps-frame-parameter): New fun.
(ps-default-fg, ps-default-bg): New default value ('frame-parameter). (ps-default-fg, ps-default-bg): New default value ('frame-parameter).
@ -1296,7 +1473,7 @@
* ps-mule.el: Eliminate Emacs 20 compatibility. * ps-mule.el: Eliminate Emacs 20 compatibility.
* ps-print.el: Eliminate Emacs 20 & 21 compatibility. * ps-print.el: Eliminate Emacs 20 & 21 compatibility.
(ps-print-version): New Version 6.7. (ps-print-version): New version 6.7.
(ps-print-quote): Replace '?\ ' by '?\s'. (ps-print-quote): Replace '?\ ' by '?\s'.
2006-11-30 Juanma Barranquero <lekktu@gmail.com> 2006-11-30 Juanma Barranquero <lekktu@gmail.com>

View file

@ -2061,7 +2061,7 @@
(face-spec-set): Set face-modified prop to nil (face-spec-set): Set face-modified prop to nil
when we change the new-frame defaults. when we change the new-frame defaults.
* cus-edit.el (custom-face-state-set): non-nil `face-modified' * cus-edit.el (custom-face-state-set): Non-nil `face-modified'
means face was set outside of Custom. means face was set outside of Custom.
2003-05-28 Richard M. Stallman <rms@gnu.org> 2003-05-28 Richard M. Stallman <rms@gnu.org>
@ -2170,7 +2170,7 @@
(gdb-display-source-buffer): Display assembler during execution, (gdb-display-source-buffer): Display assembler during execution,
when requested. when requested.
(gud-menu-map): Add a toggle button to menubar for gdb-many-windows. (gud-menu-map): Add a toggle button to menubar for gdb-many-windows.
(gdb-many-windows): Define explicitly as a function and a variable. (gdb-many-windows): Define explicitly as a function and a variable
(formerly as a minor mode). These need to be global so layout can (formerly as a minor mode). These need to be global so layout can
be reset from any buffer. be reset from any buffer.
(gdb-assembler-mode): Keep fringe outside margin as the overlay (gdb-assembler-mode): Keep fringe outside margin as the overlay
@ -3330,8 +3330,8 @@
(ada-set-default-project-file): New parameter KEEP-EXISTING. (ada-set-default-project-file): New parameter KEEP-EXISTING.
(ada-prj-find-prj-file): New parameter FILE. (ada-prj-find-prj-file): New parameter FILE.
(ada-parse-prj-file): Take into account the ADA_INCLUDE_PATH and (ada-parse-prj-file): Take into account the ADA_INCLUDE_PATH and
ADA_OBJECTS_PATH environment variables. Minor reorganization of the ADA_OBJECTS_PATH environment variables. Minor reorganization of
code. the code.
(ada-get-all-references): Add support for GNAT 3.16 cross-references. (ada-get-all-references): Add support for GNAT 3.16 cross-references.
* progmodes/ada-prj.el (ada-prj-add-keymap): Move to ada-mode.el * progmodes/ada-prj.el (ada-prj-add-keymap): Move to ada-mode.el

View file

@ -89,12 +89,12 @@ doit:
$(lisp)/cus-load.el: $(lisp)/cus-load.el:
touch $@ touch $@
custom-deps: $(lisp)/cus-load.el doit custom-deps: $(lisp)/loaddefs.el $(lisp)/cus-load.el doit
wd=$(lisp); $(setwins_almost); \ wd=$(lisp); $(setwins_almost); \
echo Directories: $$wins; \ echo Directories: $$wins; \
LC_ALL=C $(EMACS) $(EMACSOPT) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins LC_ALL=C $(EMACS) $(EMACSOPT) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins
finder-data: doit finder-data: $(lisp)/loaddefs.el doit
wd=$(lisp); $(setwins_almost); \ wd=$(lisp); $(setwins_almost); \
echo Directories: $$wins; \ echo Directories: $$wins; \
LC_ALL=C $(EMACS) $(EMACSOPT) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins LC_ALL=C $(EMACS) $(EMACSOPT) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins

View file

@ -828,6 +828,10 @@ Has a preference of looking backwards."
;; here is the position after the final }. ;; here is the position after the final }.
(backward-sexp 1) (backward-sexp 1)
(forward-sexp 1) (forward-sexp 1)
;; Skip the semicolon ``;'' for
;; enum/union/struct/class definition.
(if (= (char-after (point)) ?\;)
(forward-char 1))
(setq previous-defun-end (point))) (setq previous-defun-end (point)))
(save-excursion (save-excursion
@ -921,19 +925,9 @@ Has a preference of looking backwards."
;; Include certain keywords if they ;; Include certain keywords if they
;; precede the name. ;; precede the name.
(setq middle (point)) (setq middle (point))
;; Single (forward-sexp -1) invocation is ;; We tried calling `forward-sexp' in a loop
;; not enough for C++ member function defined ;; but it causes inconsistency for C names.
;; as part of nested class and/or namespace (forward-sexp -1)
;; like:
;;
;; void
;; foo::bar::baz::bazz ()
;; { ...
;;
;; Here we have to move the point to
;; the beginning of foo, not bazz.
(while (not (looking-back "\\(^\\|[ \t]\\)"))
(forward-sexp -1))
;; Is this C++ method? ;; Is this C++ method?
(when (and (< 2 middle) (when (and (< 2 middle)
(string= (buffer-substring (- middle 2) (string= (buffer-substring (- middle 2)

View file

@ -803,17 +803,27 @@ buffer. The hook `comint-exec-hook' is run after each exec."
proc)) proc))
(defun comint-insert-input (event) (defun comint-insert-input (event)
"In a Comint buffer, set the current input to the previous input at point." "In a Comint buffer, set the current input to the previous input at point.
If there is no previous input at point, run the command specified
by the global keymap (usually `mouse-yank-at-point')."
(interactive "e") (interactive "e")
(mouse-set-point event) (let ((pos (posn-point (event-end event)))
(let ((pos (point))) field input)
(if (not (eq (field-at-pos pos) 'input)) (with-selected-window (posn-window (event-end event))
;; No input at POS, fall back to the global definition. (and (setq field (field-at-pos pos))
(setq input (field-string-no-properties pos))))
(if (or (null comint-accum-marker)
(not (eq field 'input)))
;; Fall back to the global definition if (i) the selected
;; buffer is not a comint buffer (which can happen if a
;; non-comint window was selected and we clicked in a comint
;; window), or (ii) there is no input at POS.
(let* ((keys (this-command-keys)) (let* ((keys (this-command-keys))
(last-key (and (vectorp keys) (aref keys (1- (length keys))))) (last-key (and (vectorp keys) (aref keys (1- (length keys)))))
(fun (and last-key (lookup-key global-map (vector last-key))))) (fun (and last-key (lookup-key global-map (vector last-key)))))
(and fun (call-interactively fun))) (and fun (not (eq fun 'comint-insert-input))
;; There's previous input at POS, insert it at the end of the buffer. (call-interactively fun)))
;; Otherwise, insert the previous input.
(goto-char (point-max)) (goto-char (point-max))
;; First delete any old unsent input at the end ;; First delete any old unsent input at the end
(delete-region (delete-region
@ -821,8 +831,7 @@ buffer. The hook `comint-exec-hook' is run after each exec."
(process-mark (get-buffer-process (current-buffer)))) (process-mark (get-buffer-process (current-buffer))))
(point)) (point))
;; Insert the input at point ;; Insert the input at point
(insert (field-string-no-properties pos))))) (insert input))))
;; Input history processing in a buffer ;; Input history processing in a buffer
;; =========================================================================== ;; ===========================================================================

View file

@ -56,7 +56,7 @@ may contain even `F', `b', `i' and `s'. See also the variable
`dired-ls-F-marks-symlinks' concerning the `F' switch. `dired-ls-F-marks-symlinks' concerning the `F' switch.
On systems such as MS-DOS and MS-Windows, which use `ls' emulation in Lisp, On systems such as MS-DOS and MS-Windows, which use `ls' emulation in Lisp,
some of the `ls' switches are not supported; see the doc string of some of the `ls' switches are not supported; see the doc string of
`insert-directory' on `ls-lisp.el' for more details." `insert-directory' in `ls-lisp.el' for more details."
:type 'string :type 'string
:group 'dired) :group 'dired)

View file

@ -296,6 +296,10 @@ When this option is true, if you load the compiled file and then move it,
the functions you loaded will not be able to run.") the functions you loaded will not be able to run.")
;;;###autoload(put 'byte-compile-dynamic 'safe-local-variable 'booleanp) ;;;###autoload(put 'byte-compile-dynamic 'safe-local-variable 'booleanp)
(defvar byte-compile-disable-print-circle nil
"If non-nil, disable `print-circle' on printing a byte-compiled code.")
;;;###autoload(put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp)
(defcustom byte-compile-dynamic-docstrings t (defcustom byte-compile-dynamic-docstrings t
"*If non-nil, compile doc strings for lazy access. "*If non-nil, compile doc strings for lazy access.
We bury the doc strings of functions and variables We bury the doc strings of functions and variables
@ -2003,7 +2007,8 @@ With argument, insert value in current buffer after the form."
(print-level nil) (print-level nil)
(print-quoted t) (print-quoted t)
(print-gensym t) (print-gensym t)
(print-circle t)) ; handle circular data structures (print-circle ; handle circular data structures
(not byte-compile-disable-print-circle)))
(princ "\n" outbuffer) (princ "\n" outbuffer)
(prin1 form outbuffer) (prin1 form outbuffer)
nil))) nil)))
@ -2060,7 +2065,8 @@ list that represents a doc string reference.
;; print-gensym-alist not to be cleared ;; print-gensym-alist not to be cleared
;; between calls to print functions. ;; between calls to print functions.
(print-gensym '(t)) (print-gensym '(t))
(print-circle t) ; handle circular data structures (print-circle ; handle circular data structures
(not byte-compile-disable-print-circle))
print-gensym-alist ; was used before print-circle existed. print-gensym-alist ; was used before print-circle existed.
(print-continuous-numbering t) (print-continuous-numbering t)
print-number-table print-number-table

View file

@ -158,7 +158,7 @@ Ignores leading comment characters."
(set-syntax-table stab) (set-syntax-table stab)
(if arg (if arg
(insert (pp-to-string (eval exp))) (insert (pp-to-string (eval exp)))
(pp-eval-expression (eval exp))))) (pp-eval-expression exp))))
;;; Test cases for quote ;;; Test cases for quote
;; (pp-eval-expression ''(quote quote)) ;; (pp-eval-expression ''(quote quote))

View file

@ -93,7 +93,7 @@ See the documentation for `list-load-path-shadows' for further information."
(setq dir (directory-file-name (file-truename (or (car path) ".")))) (setq dir (directory-file-name (file-truename (or (car path) "."))))
(if (member dir true-names) (if (member dir true-names)
;; We have already considered this PATH redundant directory. ;; We have already considered this PATH redundant directory.
;; Show the redundancy if we are interactiver, unless the PATH ;; Show the redundancy if we are interactive, unless the PATH
;; dir is nil or "." (these redundant directories are just a ;; dir is nil or "." (these redundant directories are just a
;; result of the current working directory, and are therefore ;; result of the current working directory, and are therefore
;; not always redundant). ;; not always redundant).
@ -170,8 +170,8 @@ See the documentation for `list-load-path-shadows' for further information."
(defun list-load-path-shadows () (defun list-load-path-shadows ()
"Display a list of Emacs Lisp files that shadow other files. "Display a list of Emacs Lisp files that shadow other files.
This function lists potential load-path problems. Directories in the This function lists potential load path problems. Directories in
`load-path' variable are searched, in order, for Emacs Lisp the `load-path' variable are searched, in order, for Emacs Lisp
files. When a previously encountered file name is found again, a files. When a previously encountered file name is found again, a
message is displayed indicating that the later file is \"hidden\" by message is displayed indicating that the later file is \"hidden\" by
the earlier. the earlier.

View file

@ -399,6 +399,9 @@ and after the region marked by the rectangle to search."
(other :tag "Enabled" t)) (other :tag "Enabled" t))
:group 'cua) :group 'cua)
(defvar cua-global-keymap) ; forward
(defvar cua--region-keymap) ; forward
(defcustom cua-rectangle-mark-key [(control return)] (defcustom cua-rectangle-mark-key [(control return)]
"Global key used to toggle the cua rectangle mark." "Global key used to toggle the cua rectangle mark."
:set #'(lambda (symbol value) :set #'(lambda (symbol value)

View file

@ -532,7 +532,7 @@ If Viper is enabled, turn it off. Otherwise, turn it on."
;;;###autoload ;;;###autoload
(defun viper-mode () (defun viper-mode ()
"Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Viper'." "Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'."
(interactive) (interactive)
(if (not noninteractive) (if (not noninteractive)
(progn (progn

View file

@ -497,7 +497,7 @@ the second is ignored."
(defun eshell-rewrite-for-command (terms) (defun eshell-rewrite-for-command (terms)
"Rewrite a `for' command into its equivalent Eshell command form. "Rewrite a `for' command into its equivalent Eshell command form.
Because the implementation of `for' relies upon conditional evaluation Because the implementation of `for' relies upon conditional evaluation
of its argumbent (i.e., use of a Lisp special form), it must be of its argument (i.e., use of a Lisp special form), it must be
implemented via rewriting, rather than as a function." implemented via rewriting, rather than as a function."
(if (and (stringp (car terms)) (if (and (stringp (car terms))
(string= (car terms) "for") (string= (car terms) "for")

View file

@ -2505,6 +2505,7 @@ n -- to ignore the local variables list.")
", or C-v to scroll"))) ", or C-v to scroll")))
(goto-char (point-min)) (goto-char (point-min))
(let ((cursor-in-echo-area t) (let ((cursor-in-echo-area t)
(executing-kbd-macro executing-kbd-macro)
(exit-chars (exit-chars
(if offer-save '(?! ?y ?n ?\s ?\C-g) '(?y ?n ?\s ?\C-g))) (if offer-save '(?! ?y ?n ?\s ?\C-g) '(?y ?n ?\s ?\C-g)))
done) done)
@ -2512,11 +2513,17 @@ n -- to ignore the local variables list.")
(message prompt) (message prompt)
(setq char (read-event)) (setq char (read-event))
(if (numberp char) (if (numberp char)
(if (eq char ?\C-v) (cond ((eq char ?\C-v)
(condition-case nil (condition-case nil
(scroll-up) (scroll-up)
(error (goto-char (point-min)))) (error (goto-char (point-min)))))
(setq done (memq (downcase char) exit-chars)))))) ;; read-event returns -1 if we are in a kbd
;; macro and there are no more events in the
;; macro. In that case, attempt to get an
;; event interactively.
((and executing-kbd-macro (= char -1))
(setq executing-kbd-macro nil))
(t (setq done (memq (downcase char) exit-chars)))))))
(setq char (downcase char)) (setq char (downcase char))
(when (and offer-save (= char ?!) unsafe-vars) (when (and offer-save (= char ?!) unsafe-vars)
(dolist (elt unsafe-vars) (dolist (elt unsafe-vars)
@ -4742,36 +4749,37 @@ preference to the program given by this variable."
"Return the amount of free space on directory DIR's file system. "Return the amount of free space on directory DIR's file system.
The result is a string that gives the number of free 1KB blocks, The result is a string that gives the number of free 1KB blocks,
or nil if the system call or the program which retrieve the information or nil if the system call or the program which retrieve the information
fail. fail. It returns also nil when DIR is a remote directory.
This function calls `file-system-info' if it is available, or invokes the This function calls `file-system-info' if it is available, or invokes the
program specified by `directory-free-space-program' if that is non-nil." program specified by `directory-free-space-program' if that is non-nil."
;; Try to find the number of free blocks. Non-Posix systems don't (when (not (file-remote-p dir))
;; always have df, but might have an equivalent system call. ;; Try to find the number of free blocks. Non-Posix systems don't
(if (fboundp 'file-system-info) ;; always have df, but might have an equivalent system call.
(let ((fsinfo (file-system-info dir))) (if (fboundp 'file-system-info)
(if fsinfo (let ((fsinfo (file-system-info dir)))
(format "%.0f" (/ (nth 2 fsinfo) 1024)))) (if fsinfo
(save-match-data (format "%.0f" (/ (nth 2 fsinfo) 1024))))
(with-temp-buffer (save-match-data
(when (and directory-free-space-program (with-temp-buffer
(eq 0 (call-process directory-free-space-program (when (and directory-free-space-program
nil t nil (eq 0 (call-process directory-free-space-program
directory-free-space-args nil t nil
dir))) directory-free-space-args
;; Usual format is a header line followed by a line of dir)))
;; numbers. ;; Usual format is a header line followed by a line of
(goto-char (point-min)) ;; numbers.
(forward-line 1) (goto-char (point-min))
(if (not (eobp)) (forward-line 1)
(progn (if (not (eobp))
;; Move to the end of the "available blocks" number. (progn
(skip-chars-forward "^ \t") ;; Move to the end of the "available blocks" number.
(forward-word 3) (skip-chars-forward "^ \t")
;; Copy it into AVAILABLE. (forward-word 3)
(let ((end (point))) ;; Copy it into AVAILABLE.
(forward-word -1) (let ((end (point)))
(buffer-substring (point) end))))))))) (forward-word -1)
(buffer-substring (point) end))))))))))
;; The following expression replaces `dired-move-to-filename-regexp'. ;; The following expression replaces `dired-move-to-filename-regexp'.
(defvar directory-listing-before-filename-regexp (defvar directory-listing-before-filename-regexp

View file

@ -1,3 +1,18 @@
2007-01-29 Juanma Barranquero <lekktu@gmail.com>
* gnus-art.el (gnus-button-prefer-mid-or-mail): Fix typo in docstring.
2007-01-28 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
* nnslashdot.el (nnslashdot-request-article): Update end-of-article
regexp.
2007-01-24 Katsumi Yamaoka <yamaoka@jpl.org>
* uudecode.el (uudecode-string-to-multibyte): New function emulating
string-to-multibyte.
(uudecode-decode-region-internal): Use it.
2007-01-23 Reiner Steib <Reiner.Steib@gmx.de> 2007-01-23 Reiner Steib <Reiner.Steib@gmx.de>
* gnus-score.el (gnus-home-score-file, gnus-home-adapt-file): Fix * gnus-score.el (gnus-home-score-file, gnus-home-adapt-file): Fix

View file

@ -6238,7 +6238,7 @@ Strings like this can be either a message ID or a mail address. If it is one
of the symbols `mid' or `mail', Gnus will always assume that the string is a of the symbols `mid' or `mail', Gnus will always assume that the string is a
message ID or a mail address, respectively. If this variable is set to the message ID or a mail address, respectively. If this variable is set to the
symbol `ask', always query the user what do do. If it is a function, this symbol `ask', always query the user what do do. If it is a function, this
function will be called with the string as it's only argument. The function function will be called with the string as its only argument. The function
must return `mid', `mail', `invalid' or `ask'." must return `mid', `mail', `invalid' or `ask'."
:version "22.1" :version "22.1"
:group 'gnus-article-buttons :group 'gnus-article-buttons

View file

@ -259,7 +259,7 @@
(buffer-substring (buffer-substring
(search-forward "<div class=\"commentBody\">") (search-forward "<div class=\"commentBody\">")
(progn (progn
(search-forward "<div class=\"commentSub\">") (search-forward "<div class=\"commentSub\"")
(match-beginning 0)))))))) (match-beginning 0))))))))
(search-failed (nnslashdot-lose why))) (search-failed (nnslashdot-lose why)))

View file

@ -128,6 +128,20 @@ used is specified by `uudecode-decoder-program'."
(message "Can not uudecode"))) (message "Can not uudecode")))
(ignore-errors (or file-name (delete-file tempfile)))))) (ignore-errors (or file-name (delete-file tempfile))))))
(eval-and-compile
(defalias 'uudecode-string-to-multibyte
(cond
((featurep 'xemacs)
'identity)
((fboundp 'string-to-multibyte)
'string-to-multibyte)
(t
(lambda (string)
"Return a multibyte string with the same individual chars as string."
(mapconcat
(lambda (ch) (string-as-multibyte (char-to-string ch)))
string ""))))))
;;;###autoload ;;;###autoload
(defun uudecode-decode-region-internal (start end &optional file-name) (defun uudecode-decode-region-internal (start end &optional file-name)
"Uudecode region between START and END without using an external program. "Uudecode region between START and END without using an external program.
@ -206,7 +220,7 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
(or (markerp end) (setq end (set-marker (make-marker) end))) (or (markerp end) (setq end (set-marker (make-marker) end)))
(goto-char start) (goto-char start)
(if enable-multibyte-characters (if enable-multibyte-characters
(mapc #'(lambda (x) (insert (string-to-multibyte x))) (mapc #'(lambda (x) (insert (uudecode-string-to-multibyte x)))
(nreverse result)) (nreverse result))
(insert (apply 'concat (nreverse result)))) (insert (apply 'concat (nreverse result))))
(delete-region (point) end)))))) (delete-region (point) end))))))

View file

@ -60,17 +60,11 @@ to toggle between display as an image and display as text."
(setq major-mode 'image-mode) (setq major-mode 'image-mode)
(use-local-map image-mode-map) (use-local-map image-mode-map)
(add-hook 'change-major-mode-hook 'image-toggle-display-text nil t) (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t)
(if (and (display-images-p)
(not (get-text-property (point-min) 'display)))
(image-toggle-display)
;; Set next vars when image is already displayed but local
;; variables were cleared by kill-all-local-variables
(setq cursor-type nil truncate-lines t))
(run-mode-hooks 'image-mode-hook) (run-mode-hooks 'image-mode-hook)
(if (display-images-p) (if (display-images-p)
(message "%s" (concat (message "%s" (concat
(substitute-command-keys (substitute-command-keys
"Type \\[image-toggle-display] to view the image as ") "Type \\[image-toggle-display] to view as ")
(if (get-text-property (point-min) 'display) (if (get-text-property (point-min) 'display)
"text" "an image") ".")))) "text" "an image") "."))))
@ -179,6 +173,11 @@ and showing the image as an image."
(if (called-interactively-p) (if (called-interactively-p)
(message "Repeat this command to go back to displaying the file as text"))))) (message "Repeat this command to go back to displaying the file as text")))))
(put 'image-toggle-display 'disabled "\
WARNING: Displaying images can be a security risk.
Please make sure you're using up-to-date image libraries
and the images displayed come from a trusted source.")
(provide 'image-mode) (provide 'image-mode)
;; arch-tag: b5b2b7e6-26a7-4b79-96e3-1546b5c4c6cb ;; arch-tag: b5b2b7e6-26a7-4b79-96e3-1546b5c4c6cb

View file

@ -36,7 +36,7 @@
(defconst image-type-header-regexps (defconst image-type-header-regexps
'(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm) '(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm)
("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" . pbm) ("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" . pbm)
("\\`GIF8" . gif) ("\\`GIF8[79]a" . gif)
("\\`\x89PNG\r\n\x1a\n" . png) ("\\`\x89PNG\r\n\x1a\n" . png)
("\\`[\t\n\r ]*#define \\([a-z0-9]+\\)_width [0-9]+\n\ ("\\`[\t\n\r ]*#define \\([a-z0-9]+\\)_width [0-9]+\n\
#define \\1_height [0-9]+\n\ #define \\1_height [0-9]+\n\

View file

@ -362,7 +362,7 @@ The name of generated file is specified by the variable `ja-dic-filename'."
(erase-buffer) (erase-buffer)
(buffer-disable-undo) (buffer-disable-undo)
(insert ";;; ja-dic.el --- dictionary for Japanese input method" (insert ";;; ja-dic.el --- dictionary for Japanese input method"
" -*-coding: iso-2022-jp;-*-\n" " -*-coding: iso-2022-jp; byte-compile-disable-print-circle:t; -*-\n"
";;\tGenerated by the command `skkdic-convert'\n" ";;\tGenerated by the command `skkdic-convert'\n"
";;\tDate: " (current-time-string) "\n" ";;\tDate: " (current-time-string) "\n"
";;\tOriginal SKK dictionary file: " ";;\tOriginal SKK dictionary file: "

View file

@ -1665,7 +1665,7 @@ cons (CODING . SOURCE), where CODING is the specified coding
system and SOURCE is a symbol `auto-coding-alist', system and SOURCE is a symbol `auto-coding-alist',
`auto-coding-regexp-alist', `coding:', or `auto-coding-functions' `auto-coding-regexp-alist', `coding:', or `auto-coding-functions'
indicating by what CODING is specified. Note that the validity indicating by what CODING is specified. Note that the validity
of CODING is not checked; it's callers responsibility to check it. of CODING is not checked; it's the caller's responsibility to check it.
If nothing is specified, the return value is nil." If nothing is specified, the return value is nil."
(or (let ((coding-system (auto-coding-alist-lookup filename))) (or (let ((coding-system (auto-coding-alist-lookup filename)))

View file

@ -275,7 +275,8 @@ SPC, 6, 3, 4, or 7 specifing a tone (SPC:$(0?v(N(B, 6:$(0Dm(N(B, 3:$(0&9Vy
(princ ";; Quail package `") (princ ";; Quail package `")
(princ package) (princ package)
(princ (format "' -*- coding:%s; -*-\n" coding-system-for-write)) (princ (format "' -*- coding:%s; " coding-system-for-write))
(princ "byte-compile-disable-print-circle:t; -*-\n")
(princ ";; Generated by the command `titdic-convert'\n;;\tDate: ") (princ ";; Generated by the command `titdic-convert'\n;;\tDate: ")
(princ (current-time-string)) (princ (current-time-string))
(princ "\n;;\tOriginal TIT dictionary file: ") (princ "\n;;\tOriginal TIT dictionary file: ")
@ -908,6 +909,9 @@ method `chinese-tonepy' with which you must specify tones by digits
(let ((pos (point))) (let ((pos (point)))
(insert-buffer-substring dicbuf) (insert-buffer-substring dicbuf)
(goto-char pos) (goto-char pos)
(re-search-forward "^[a-z]")
(beginning-of-line)
(delete-region pos (point))
(while (not (eobp)) (while (not (eobp))
(insert "(\"") (insert "(\"")
(skip-chars-forward "a-z") (skip-chars-forward "a-z")
@ -1141,8 +1145,8 @@ the generated Quail package is saved."
(message "Converting %s to %s..." dicfile quailfile) (message "Converting %s to %s..." dicfile quailfile)
(setq coding-system-for-write coding) (setq coding-system-for-write coding)
(with-temp-file (expand-file-name quailfile dirname) (with-temp-file (expand-file-name quailfile dirname)
(insert (format ";; Quail package `%s' -*- coding:%s; -*-\n" (insert (format ";; Quail package `%s' -*- coding:%s; " name coding))
name coding)) (insert "byte-compile-disable-print-circle:t; -*-\n")
(insert ";; Generated by the command `miscdic-convert'\n") (insert ";; Generated by the command `miscdic-convert'\n")
(insert ";; Date: " (current-time-string) "\n") (insert ";; Date: " (current-time-string) "\n")
(insert ";; Source dictionary file: " dicfile "\n") (insert ";; Source dictionary file: " dicfile "\n")

View file

@ -115,7 +115,7 @@ If nil, don't use a timeout."
(defun isearchb-iswitchb () (defun isearchb-iswitchb ()
"isearchb's custom version of the `iswitchb' command. "isearchb's custom version of the `iswitchb' command.
It's purpose is to pass different call arguments to Its purpose is to pass different call arguments to
`iswitchb-read-buffer'." `iswitchb-read-buffer'."
(interactive) (interactive)
(let* ((prompt "iswitch ") (let* ((prompt "iswitch ")

View file

@ -248,10 +248,6 @@ APPEND-FLAG STRIP-EXTENSION-FLAG FILE-MAGIC-CHARS], where:
file-magic-chars is a string of characters that you would find file-magic-chars is a string of characters that you would find
at the beginning of a file compressed in this way. at the beginning of a file compressed in this way.
Because of the way `call-process' is defined, discarding the stderr output of
a program adds the overhead of starting a shell each time the program is
invoked.
If you set this outside Custom while Auto Compression mode is If you set this outside Custom while Auto Compression mode is
already enabled \(as it is by default), you have to call already enabled \(as it is by default), you have to call
`jka-compr-update' after setting it to properly update other `jka-compr-update' after setting it to properly update other

View file

@ -47,18 +47,9 @@
;; The default value of this variable allows jka-compr to work with ;; The default value of this variable allows jka-compr to work with
;; Unix compress and gzip. ;; Unix compress and gzip.
;; ;;
;; If you are concerned about the stderr output of gzip and other
;; compression/decompression programs showing up in your buffers, you
;; should set the discard-error flag in the compression-info-list.
;; This will cause the stderr of all programs to be discarded.
;; However, it also causes emacs to call compression/uncompression
;; programs through a shell (which is specified by jka-compr-shell).
;; This may be a drag if, on your system, starting up a shell is
;; slow.
;;
;; If you don't want messages about compressing and decompressing ;; If you don't want messages about compressing and decompressing
;; to show up in the echo area, you can set the compress-name and ;; to show up in the echo area, you can set the compress-msg and
;; decompress-name fields of the jka-compr-compression-info-list to ;; decompress-msg fields of the jka-compr-compression-info-list to
;; nil. ;; nil.
@ -105,9 +96,7 @@
(defcustom jka-compr-shell "sh" (defcustom jka-compr-shell "sh"
"*Shell to be used for calling compression programs. "*Shell to be used for calling compression programs.
The value of this variable only matters if you want to discard the NOTE: Not used in MS-DOS and Windows systems."
stderr of a compression/decompression program (see the documentation
for `jka-compr-compression-info-list')."
:type 'string :type 'string
:group 'jka-compr) :group 'jka-compr)
@ -166,6 +155,12 @@ to keep: LEN chars starting BEG chars from the beginning."
;; to discard the part we don't want. ;; to discard the part we don't want.
(let ((skip (/ beg jka-compr-dd-blocksize)) (let ((skip (/ beg jka-compr-dd-blocksize))
(err-file (jka-compr-make-temp-name)) (err-file (jka-compr-make-temp-name))
;; call-process barfs if default-directory is inaccessible.
(default-directory
(if (and default-directory
(file-accessible-directory-p default-directory))
default-directory
(file-name-directory infile)))
count) count)
;; Update PREFIX based on the text that we won't read in. ;; Update PREFIX based on the text that we won't read in.
(setq prefix (- beg (* skip jka-compr-dd-blocksize)) (setq prefix (- beg (* skip jka-compr-dd-blocksize))
@ -204,45 +199,41 @@ to keep: LEN chars starting BEG chars from the beginning."
(defun jka-compr-call-process (prog message infile output temp args) (defun jka-compr-call-process (prog message infile output temp args)
(if jka-compr-use-shell ;; call-process barfs if default-directory is inaccessible.
(let ((default-directory
(let ((err-file (jka-compr-make-temp-name)) (if (and default-directory
(coding-system-for-read (or coding-system-for-read 'undecided)) (file-accessible-directory-p default-directory))
(coding-system-for-write 'no-conversion)) default-directory
(file-name-directory infile))))
(unwind-protect (if jka-compr-use-shell
(let ((err-file (jka-compr-make-temp-name))
(or (memq (coding-system-for-read (or coding-system-for-read 'undecided))
(call-process jka-compr-shell infile (coding-system-for-write 'no-conversion))
(if (stringp output) nil output) (unwind-protect
nil (or (memq
"-c" (call-process jka-compr-shell infile
(format "%s %s 2> %s %s" (if (stringp output) nil output)
prog nil
(mapconcat 'identity args " ") "-c"
err-file (format "%s %s 2> %s %s"
(if (stringp output) prog
(concat "> " output) (mapconcat 'identity args " ")
""))) err-file
jka-compr-acceptable-retval-list) (if (stringp output)
(concat "> " output)
(jka-compr-error prog args infile message err-file)) "")))
jka-compr-acceptable-retval-list)
(jka-compr-delete-temp-file err-file))) (jka-compr-error prog args infile message err-file))
(jka-compr-delete-temp-file err-file)))
(or (eq 0 (or (eq 0
(apply 'call-process (apply 'call-process
prog prog infile (if (stringp output) temp output)
infile nil args))
(if (stringp output) temp output) (jka-compr-error prog args infile message))
nil (and (stringp output)
args)) (with-current-buffer temp
(jka-compr-error prog args infile message)) (write-region (point-min) (point-max) output)
(erase-buffer))))))
(and (stringp output)
(with-current-buffer temp
(write-region (point-min) (point-max) output)
(erase-buffer)))))
;; Support for temp files. Much of this was inspired if not lifted ;; Support for temp files. Much of this was inspired if not lifted

File diff suppressed because it is too large Load diff

View file

@ -151,7 +151,10 @@ Otherwise they are treated as Emacs regexps (for backward compatibility)."
'("%b %e %H:%M" '("%b %e %H:%M"
"%b %e %Y") "%b %e %Y")
"*List of `format-time-string' specs to display file time stamps. "*List of `format-time-string' specs to display file time stamps.
They are used whenever a locale is not specified to use instead. These specs are used ONLY if a valid locale can not be determined.
If `ls-lisp-use-localized-time-format' is non-nil, these specs are used
regardless of whether the locale can be determined.
Syntax: (EARLY-TIME-FORMAT OLD-TIME-FORMAT) Syntax: (EARLY-TIME-FORMAT OLD-TIME-FORMAT)
@ -166,6 +169,15 @@ current year. The OLD-TIME-FORMAT is used for older files. To use ISO
(string :tag "Old time format")) (string :tag "Old time format"))
:group 'ls-lisp) :group 'ls-lisp)
(defcustom ls-lisp-use-localized-time-format nil
"*Non-nil causes ls-lisp to use `ls-lisp-format-time-list' even if
a valid locale is specified.
WARNING: Using localized date/time format might cause Dired columns
to fail to lign up, e.g. if month names are not all of the same length."
:type 'boolean
:group 'ls-lisp)
(defvar original-insert-directory nil (defvar original-insert-directory nil
"This holds the original function definition of `insert-directory'.") "This holds the original function definition of `insert-directory'.")
@ -567,8 +579,12 @@ All ls time options, namely c, t and u, are handled."
(setq locale nil)) (setq locale nil))
(format-time-string (format-time-string
(if (and (<= past-cutoff diff) (<= diff 0)) (if (and (<= past-cutoff diff) (<= diff 0))
(if locale "%m-%d %H:%M" (nth 0 ls-lisp-format-time-list)) (if (and locale (not ls-lisp-use-localized-time-format))
(if locale "%Y-%m-%d " (nth 1 ls-lisp-format-time-list))) "%m-%d %H:%M"
(nth 0 ls-lisp-format-time-list))
(if (and locale (not ls-lisp-use-localized-time-format))
"%Y-%m-%d "
(nth 1 ls-lisp-format-time-list)))
time)) time))
(error "Unk 0 0000")))) (error "Unk 0 0000"))))

View file

@ -422,8 +422,8 @@ Each element of this list has the following form:
(...))) (...)))
Where INFOKEY is a key for `sc-mail-field', REGEXP is a regular Where INFOKEY is a key for `sc-mail-field', REGEXP is a regular
expression to match against the INFOKEY's value. ATTRIBUTION can be a expression to match against the INFOKEY's value. ATTRIBUTION can be a
string or a list. If its a string, then it is the attribution that is string or a list. If it's a string, then it is the attribution that is
selected by `sc-select-attribution'. If it is a list, it is `eval'd selected by `sc-select-attribution'. If it is a list, it is `eval'd
and the return value must be a string, which is used as the selected and the return value must be a string, which is used as the selected
attribution. Note that the variable `sc-preferred-attribution-list' attribution. Note that the variable `sc-preferred-attribution-list'

View file

@ -99,11 +99,11 @@ $(lisp)/cus-load.el:
touch $@ touch $@
# WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
# this can break with GNU Make 3.81 and later if sh.exe is used. # this can break with GNU Make 3.81 and later if sh.exe is used.
custom-deps: $(lisp)/cus-load.el doit custom-deps: $(lisp)/cus-load.el $(lisp)/loaddefs.el doit
@echo Directories: $(WINS) @echo Directories: $(WINS)
-$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS) -$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS)
finder-data: doit finder-data: $(lisp)/loaddefs.el doit
@echo Directories: $(WINS) @echo Directories: $(WINS)
$(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS) $(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS)

View file

@ -1041,19 +1041,19 @@ should only be used by mouse-drag-region."
(if do-multi-click (goto-char start-point)) (if do-multi-click (goto-char start-point))
(delete-overlay mouse-drag-overlay) (delete-overlay mouse-drag-overlay)
(when (and (functionp fun) (when (and (functionp fun)
(= start-hscroll (window-hscroll start-window)) (= start-hscroll (window-hscroll start-window))
;; Don't run the up-event handler if the ;; Don't run the up-event handler if the
;; window start changed in a redisplay after ;; window start changed in a redisplay after
;; the mouse-set-point for the down-mouse ;; the mouse-set-point for the down-mouse
;; event at the beginning of this function. ;; event at the beginning of this function.
;; When the window start has changed, the ;; When the window start has changed, the
;; up-mouse event will contain a different ;; up-mouse event will contain a different
;; position due to the new window contents, ;; position due to the new window contents,
;; and point is set again. ;; and point is set again.
(or end-point (or end-point
(= (window-start start-window) (= (window-start start-window)
start-window-start))) start-window-start)))
(when (and on-link (when (and on-link
(or (not end-point) (= end-point start-point)) (or (not end-point) (= end-point start-point))
(consp event) (consp event)
(or remap-double-click (or remap-double-click

View file

@ -2599,7 +2599,7 @@ away in the internal cache."
(if wildcard (if wildcard
(progn (progn
(ange-ftp-cd host user (file-name-directory name)) (ange-ftp-cd host user (file-name-directory name))
(setq lscmd (list 'dir file temp lsargs))) (setq lscmd (list 'ls file temp lsargs)))
(setq lscmd (list 'dir name temp lsargs))) (setq lscmd (list 'dir name temp lsargs)))
(unwind-protect (unwind-protect
(if (car (setq result (ange-ftp-send-cmd (if (car (setq result (ange-ftp-send-cmd

View file

@ -3245,8 +3245,13 @@ be a local filename. The method used must be an out-of-band method."
;; Use rcp-like program for file transfer. ;; Use rcp-like program for file transfer.
(unwind-protect (unwind-protect
(let ((p (apply 'start-process (buffer-name trampbuf) trampbuf (let* ((default-directory
copy-program copy-args))) (if (and (stringp default-directory)
(file-accessible-directory-p default-directory))
default-directory
(tramp-temporary-file-directory)))
(p (apply 'start-process (buffer-name trampbuf) trampbuf
copy-program copy-args)))
(tramp-set-process-query-on-exit-flag p nil) (tramp-set-process-query-on-exit-flag p nil)
(tramp-process-actions p multi-method method user host (tramp-process-actions p multi-method method user host
tramp-actions-copy-out-of-band)) tramp-actions-copy-out-of-band))

View file

@ -72,7 +72,7 @@
;; ;;
;; Keywords. ;; Keywords.
(regexp-opt (regexp-opt
'("BEGIN" "END" "break" "continue" "delete" "exit" "else" "for" '("BEGIN" "END" "break" "continue" "delete" "do" "exit" "else" "for"
"getline" "if" "next" "print" "printf" "return" "while") 'words) "getline" "if" "next" "print" "printf" "return" "while") 'words)
;; ;;
;; Builtins. ;; Builtins.

View file

@ -471,19 +471,22 @@ If INVISIBLE-OK is non-nil, an invisible heading line is ok too."
(if up "Parent" "Demoted") head) (if up "Parent" "Demoted") head)
head nil nil t))))) head nil nil t)))))
(defun outline-promote (&optional children) (defun outline-promote (&optional which)
"Promote headings higher up the tree. "Promote headings higher up the tree.
If prefix argument CHILDREN is given, promote also all the children. If transient-mark-mode is on, and mark is active, promote headings in
If the region is active in `transient-mark-mode', promote all headings the region (from a Lisp program, pass `region' for WHICH). Otherwise:
in the region." without prefix argument, promote current heading and all headings in the
subtree (from a Lisp program, pass `subtree' for WHICH); with prefix
argument, promote just the current heading (from a Lisp program, pass
nil for WHICH, or do not pass any argument)."
(interactive (interactive
(list (if (and transient-mark-mode mark-active) 'region (list (if (and transient-mark-mode mark-active) 'region
(outline-back-to-heading) (outline-back-to-heading)
(if current-prefix-arg nil 'subtree)))) (if current-prefix-arg nil 'subtree))))
(cond (cond
((eq children 'region) ((eq which 'region)
(outline-map-region 'outline-promote (region-beginning) (region-end))) (outline-map-region 'outline-promote (region-beginning) (region-end)))
(children (which
(outline-map-region 'outline-promote (outline-map-region 'outline-promote
(point) (point)
(save-excursion (outline-get-next-sibling) (point)))) (save-excursion (outline-get-next-sibling) (point))))
@ -507,19 +510,22 @@ in the region."
(replace-match up-head nil t))))) (replace-match up-head nil t)))))
(defun outline-demote (&optional children) (defun outline-demote (&optional which)
"Demote headings lower down the tree. "Demote headings lower down the tree.
If prefix argument CHILDREN is given, demote also all the children. If transient-mark-mode is on, and mark is active, demote headings in
If the region is active in `transient-mark-mode', demote all headings the region (from a Lisp program, pass `region' for WHICH). Otherwise:
in the region." without prefix argument, demote current heading and all headings in the
subtree (from a Lisp program, pass `subtree' for WHICH); with prefix
argument, demote just the current heading (from a Lisp program, pass
nil for WHICH, or do not pass any argument)."
(interactive (interactive
(list (if (and transient-mark-mode mark-active) 'region (list (if (and transient-mark-mode mark-active) 'region
(outline-back-to-heading) (outline-back-to-heading)
(if current-prefix-arg nil 'subtree)))) (if current-prefix-arg nil 'subtree))))
(cond (cond
((eq children 'region) ((eq which 'region)
(outline-map-region 'outline-demote (region-beginning) (region-end))) (outline-map-region 'outline-demote (region-beginning) (region-end)))
(children (which
(outline-map-region 'outline-demote (outline-map-region 'outline-demote
(point) (point)
(save-excursion (outline-get-next-sibling) (point)))) (save-excursion (outline-get-next-sibling) (point))))

View file

@ -420,7 +420,7 @@ static unsigned char gamegrid_bits[] = {
(if gamegrid-timer (if gamegrid-timer
(if (featurep 'itimer) (if (featurep 'itimer)
(delete-itimer gamegrid-timer) (delete-itimer gamegrid-timer)
(timer-set-time gamegrid-timer '(0 0 0) nil))) (cancel-timer gamegrid-timer)))
(setq gamegrid-timer nil)) (setq gamegrid-timer nil))
;; ;;;;;;;;;;;;;;; high score functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; ;;;;;;;;;;;;;;; high score functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -515,41 +515,42 @@ FILE is created there."
(defun gamegrid-add-score-with-update-game-score-1 (file target score) (defun gamegrid-add-score-with-update-game-score-1 (file target score)
(let ((default-directory "/") (let ((default-directory "/")
(errbuf (generate-new-buffer " *update-game-score loss*"))) (errbuf (generate-new-buffer " *update-game-score loss*")))
(apply ;; This can be called from a timer, so enable local quits.
'call-process (with-local-quit
(append (apply
(list 'call-process
(expand-file-name "update-game-score" exec-directory) (append
nil errbuf nil (list
"-m" (int-to-string gamegrid-score-file-length) (expand-file-name "update-game-score" exec-directory)
"-d" (if gamegrid-shared-game-dir nil errbuf nil
(expand-file-name shared-game-score-directory) "-m" (int-to-string gamegrid-score-file-length)
(file-name-directory target)) "-d" (if gamegrid-shared-game-dir
file (expand-file-name shared-game-score-directory)
(int-to-string score) (file-name-directory target))
(concat file
(user-full-name) (int-to-string score)
" <" (concat
(cond ((fboundp 'user-mail-address) (user-full-name)
(user-mail-address)) " <"
((boundp 'user-mail-address) (cond ((fboundp 'user-mail-address)
user-mail-address) (user-mail-address))
(t "")) ((boundp 'user-mail-address)
"> " user-mail-address)
(current-time-string))))) (t ""))
"> "
(current-time-string))))))
(if (buffer-modified-p errbuf) (if (buffer-modified-p errbuf)
(progn (progn
(display-buffer errbuf) (display-buffer errbuf)
(error "Failed to update game score file")) (error "Failed to update game score file"))
(kill-buffer errbuf)) (kill-buffer errbuf))
(save-excursion (let ((buf (find-buffer-visiting target)))
(let ((buf (find-buffer-visiting target))) (if buf
(if buf (progn
(progn (with-current-buffer buf
(with-current-buffer buf (revert-buffer nil t nil))
(revert-buffer nil t nil)) (display-buffer buf))
(display-buffer buf)) (find-file-read-only-other-window target)))))
(find-file-read-only-other-window target))))))
(defun gamegrid-add-score-insecure (file score &optional directory) (defun gamegrid-add-score-insecure (file score &optional directory)
(save-excursion (save-excursion

View file

@ -362,9 +362,9 @@ Element 0 is ignored."
(setq tetris-pos-y 0) (setq tetris-pos-y 0)
(if (tetris-test-shape) (if (tetris-test-shape)
(tetris-end-game) (tetris-end-game)
(tetris-draw-shape)) (tetris-draw-shape)
(tetris-draw-next-shape) (tetris-draw-next-shape)
(tetris-update-score)) (tetris-update-score)))
(defun tetris-draw-next-shape () (defun tetris-draw-next-shape ()
(loop for y from 0 to 3 do (loop for y from 0 to 3 do

View file

@ -740,7 +740,7 @@ be after it."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; V i r t u a l S e m i c o l o n s ;; V i r t u a l S e m i c o l o n s
;; ;;
;; In most CC Mode languages, statements are terminated explicitly by ;; In most CC Mode languages, statements are terminated explicitly by
;; semicolons or closing braces. In some of the CC modes (currently only AWK ;; semicolons or closing braces. In some of the CC modes (currently only AWK
@ -784,7 +784,7 @@ be after it."
;; ;;
;; The macro `c-vsemi-status-unknown-p' will typically check the cacheing ;; The macro `c-vsemi-status-unknown-p' will typically check the cacheing
;; scheme used by the `c-at-vsemi-p-fn', hence the name - the status is ;; scheme used by the `c-at-vsemi-p-fn', hence the name - the status is
;; "unknown" if there is no cache entry current for the line. ;; "unknown" if there is no cache entry current for the line.
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
(defmacro c-at-vsemi-p (&optional pos) (defmacro c-at-vsemi-p (&optional pos)
@ -1514,8 +1514,8 @@ might be present:
(i.e. the syntax class `|'). (i.e. the syntax class `|').
'pps-extended-state `parse-partial-sexp' returns a list with at least 10 'pps-extended-state `parse-partial-sexp' returns a list with at least 10
elements, i.e. it contains the position of the start of elements, i.e. it contains the position of the start of
the last comment or string. It's always set - CC Mode no the last comment or string. It's always set - CC Mode
longer works in emacsen without this feature. no longer works in emacsen without this feature.
'posix-char-classes The regexp engine understands POSIX character classes. 'posix-char-classes The regexp engine understands POSIX character classes.
'col-0-paren It's possible to turn off the ad-hoc rule that a paren 'col-0-paren It's possible to turn off the ad-hoc rule that a paren
in column zero is the start of a defun. in column zero is the start of a defun.

View file

@ -1168,7 +1168,7 @@ OFFSET can specify an offset in several different ways:
If OFFSET is a symbol with a value binding then that value, which If OFFSET is a symbol with a value binding then that value, which
must be an integer, is used as relative offset. must be an integer, is used as relative offset.
If OFFSET is a vector then it's first element, which must be an If OFFSET is a vector then its first element, which must be an
integer, is used as an absolute indentation column. This overrides integer, is used as an absolute indentation column. This overrides
the previous base indentation and the relative offsets applied to the previous base indentation and the relative offsets applied to
it, and it becomes the new base indentation. it, and it becomes the new base indentation.

View file

@ -1626,7 +1626,7 @@ Return full-name. Names are real, not patched."
buildfile-name source-file-name))))) buildfile-name source-file-name)))))
(defun flymake-init-create-temp-source-and-master-buffer-copy (get-incl-dirs-f create-temp-f master-file-masks include-regexp) (defun flymake-init-create-temp-source-and-master-buffer-copy (get-incl-dirs-f create-temp-f master-file-masks include-regexp)
"Find master file (or buffer), create it's copy along with a copy of the source file." "Find master file (or buffer), create its copy along with a copy of the source file."
(let* ((source-file-name buffer-file-name) (let* ((source-file-name buffer-file-name)
(temp-source-file-name (flymake-init-create-temp-buffer-copy create-temp-f)) (temp-source-file-name (flymake-init-create-temp-buffer-copy create-temp-f))
(master-and-temp-master (flymake-create-master-file (master-and-temp-master (flymake-create-master-file

View file

@ -1788,6 +1788,9 @@ static char *magick[] = {
"Face for disabled breakpoint icon in fringe." "Face for disabled breakpoint icon in fringe."
:group 'gud) :group 'gud)
(defconst gdb-breakpoint-regexp
"\\([0-9]+\\).*?\\(?:point\\|catch\\s-+\\S-+\\)\\s-+\\S-+\\s-+\\(.\\)\\s-+")
;; Put breakpoint icons in relevant margins (even those set in the GUD buffer). ;; Put breakpoint icons in relevant margins (even those set in the GUD buffer).
(defun gdb-info-breakpoints-custom () (defun gdb-info-breakpoints-custom ()
(let ((flag) (bptno)) (let ((flag) (bptno))
@ -1981,9 +1984,6 @@ static char *magick[] = {
'gdb-invalidate-breakpoints 'gdb-invalidate-breakpoints
'gdbmi-invalidate-breakpoints)) 'gdbmi-invalidate-breakpoints))
(defconst gdb-breakpoint-regexp
"\\([0-9]+\\).*?\\(?:point\\|catch\\s-+\\S-+\\)\\s-+\\S-+\\s-+\\(.\\)\\s-+")
(defun gdb-toggle-breakpoint () (defun gdb-toggle-breakpoint ()
"Enable/disable breakpoint at current line." "Enable/disable breakpoint at current line."
(interactive) (interactive)
@ -3436,14 +3436,26 @@ in_scope=\"\\(.*?\\)\".*?}")
(let* ((varnum (match-string 1)) (let* ((varnum (match-string 1))
(var (assoc varnum gdb-var-list))) (var (assoc varnum gdb-var-list)))
(when var (when var
(if (string-equal (match-string 3) "false") (let ((match (match-string 3)))
(setcar (nthcdr 5 var) 'out-of-scope) (cond ((string-equal match "false")
(setcar (nthcdr 5 var) 'changed) (setcar (nthcdr 5 var) 'out-of-scope))
(setcar (nthcdr 4 var) ((string-equal match "true")
(read (match-string 2))))))) (setcar (nthcdr 5 var) 'changed)
(setq gdb-pending-triggers (setcar (nthcdr 4 var)
(delq 'gdb-var-update gdb-pending-triggers)) (read (match-string 2))))
(gdb-speedbar-update)) ;; ((string-equal match "invalid")
;; (gdb-enqueue-input
;; (list
;; (if (eq (buffer-local-value
;; 'gud-minor-mode gud-comint-buffer) 'gdba)
;; (concat "server interpreter mi \"-var-delete "
;; varnum "\"\n")
;; (concat "-var-delete " varnum "\n"))
;; 'ignore)))
)))))
(setq gdb-pending-triggers
(delq 'gdb-var-update gdb-pending-triggers))
(gdb-speedbar-update))
;; Registers buffer. ;; Registers buffer.
;; ;;

View file

@ -1147,7 +1147,7 @@ default setting as example)."
(concat (concat
"*Specifies how the name for the components package is obtained. "*Specifies how the name for the components package is obtained.
The components package is a package containing all component declarations for The components package is a package containing all component declarations for
the current design. It's name can be obtained by modifying the project name the current design. Its name can be obtained by modifying the project name
\(e.g. attaching or stripping off a substring). If no project is defined, the \(e.g. attaching or stripping off a substring). If no project is defined, the
DIRECTORY entry is chosen." DIRECTORY entry is chosen."
vhdl-name-doc-string) vhdl-name-doc-string)
@ -2434,7 +2434,7 @@ conversion."
(insert-file-contents filename t))) (insert-file-contents filename t)))
(defun vhdl-sort-alist (alist) (defun vhdl-sort-alist (alist)
"Sort alist." "Sort ALIST."
(sort alist (function (lambda (a b) (string< (car a) (car b)))))) (sort alist (function (lambda (a b) (string< (car a) (car b))))))
(defun vhdl-get-subdirs (directory) (defun vhdl-get-subdirs (directory)
@ -5239,7 +5239,7 @@ Return a valid value only."
(defun vhdl-set-offset (symbol offset &optional add-p) (defun vhdl-set-offset (symbol offset &optional add-p)
"Change the value of a syntactic element symbol in `vhdl-offsets-alist'. "Change the value of a syntactic element symbol in `vhdl-offsets-alist'.
SYMBOL is the syntactic element symbol to change and OFFSET is the new SYMBOL is the syntactic element symbol to change and OFFSET is the new
offset for that syntactic element. Optional ADD says to add SYMBOL to offset for that syntactic element. Optional ADD-P says to add SYMBOL to
`vhdl-offsets-alist' if it doesn't already appear there." `vhdl-offsets-alist' if it doesn't already appear there."
(interactive (interactive
(let* ((langelem (let* ((langelem
@ -5765,7 +5765,7 @@ keyword."
"If the word at the current position corresponds to an \"end\" "If the word at the current position corresponds to an \"end\"
keyword, then return a vector containing enough information to find keyword, then return a vector containing enough information to find
the corresponding \"begin\" keyword, else return nil. The keyword to the corresponding \"begin\" keyword, else return nil. The keyword to
search backward for is aref 0. The column in which the keyword must search backward for is aref 0. The column in which the keyword must
appear is aref 1 or nil if any column is suitable. The supplementary appear is aref 1 or nil if any column is suitable. The supplementary
keyword to search forward for is aref 2 or nil if this is not keyword to search forward for is aref 2 or nil if this is not
required. If aref 3 is t, then the \"begin\" keyword may be found in required. If aref 3 is t, then the \"begin\" keyword may be found in
@ -6424,8 +6424,8 @@ statement if already at the beginning of one."
;; Defuns for calculating the current syntactic state: ;; Defuns for calculating the current syntactic state:
(defun vhdl-get-library-unit (bod placeholder) (defun vhdl-get-library-unit (bod placeholder)
"If there is an enclosing library unit at bod, with it's \"begin\" "If there is an enclosing library unit at BOD, with its \"begin\"
keyword at placeholder, then return the library unit type." keyword at PLACEHOLDER, then return the library unit type."
(let ((here (vhdl-point 'bol))) (let ((here (vhdl-point 'bol)))
(if (save-excursion (if (save-excursion
(goto-char placeholder) (goto-char placeholder)
@ -6448,7 +6448,7 @@ keyword at placeholder, then return the library unit type."
(defun vhdl-get-block-state (&optional lim) (defun vhdl-get-block-state (&optional lim)
"Finds and records all the closest opens. "Finds and records all the closest opens.
lim is the furthest back we need to search (it should be the LIM is the furthest back we need to search (it should be the
previous libunit keyword)." previous libunit keyword)."
(let ((here (point)) (let ((here (point))
(lim (or lim (point-min))) (lim (or lim (point-min)))
@ -6514,8 +6514,8 @@ previous libunit keyword)."
(defun vhdl-skip-case-alternative (&optional lim) (defun vhdl-skip-case-alternative (&optional lim)
"Skip forward over case/when bodies, with optional maximal "Skip forward over case/when bodies, with optional maximal
limit. If no next case alternative is found, nil is returned and point limit. If no next case alternative is found, nil is returned and
is not moved." point is not moved."
(let ((lim (or lim (point-max))) (let ((lim (or lim (point-max)))
(here (point)) (here (point))
donep foundp) donep foundp)
@ -6541,7 +6541,7 @@ is not moved."
(defun vhdl-backward-skip-label (&optional lim) (defun vhdl-backward-skip-label (&optional lim)
"Skip backward over a label, with optional maximal "Skip backward over a label, with optional maximal
limit. If label is not found, nil is returned and point limit. If label is not found, nil is returned and point
is not moved." is not moved."
(let ((lim (or lim (point-min))) (let ((lim (or lim (point-min)))
placeholder) placeholder)
@ -7306,9 +7306,9 @@ indentation is done before aligning."
(defun vhdl-align-region-2 (begin end match &optional substr spacing) (defun vhdl-align-region-2 (begin end match &optional substr spacing)
"Align a range of lines from BEGIN to END. The regular expression "Align a range of lines from BEGIN to END. The regular expression
MATCH must match exactly one fields: the whitespace to be MATCH must match exactly one field: the whitespace to be
contracted/expanded. The alignment column will equal the contracted/expanded. The alignment column will equal the
rightmost column of the widest whitespace block. SPACING is rightmost column of the widest whitespace block. SPACING is
the amount of extra spaces to add to the calculated maximum required. the amount of extra spaces to add to the calculated maximum required.
SPACING defaults to 1 so that at least one space is inserted after SPACING defaults to 1 so that at least one space is inserted after
the token in MATCH." the token in MATCH."
@ -8101,7 +8101,7 @@ Turn on if ARG positive, turn off if ARG negative, toggle if ARG zero or nil."
(defun vhdl-electric-dash (count) (defun vhdl-electric-dash (count)
"-- starts a comment, --- draws a horizontal line, "-- starts a comment, --- draws a horizontal line,
---- starts a display comment" ---- starts a display comment."
(interactive "p") (interactive "p")
(if (and vhdl-stutter-mode (not (vhdl-in-literal))) (if (and vhdl-stutter-mode (not (vhdl-in-literal)))
(cond (cond
@ -10448,7 +10448,7 @@ with double-quotes is to be inserted. DEFAULT specifies a default string."
(if vhdl-upper-case-keywords (upcase keyword) (downcase keyword))) (if vhdl-upper-case-keywords (upcase keyword) (downcase keyword)))
(defun vhdl-case-word (num) (defun vhdl-case-word (num)
"Adjust case or following NUM words." "Adjust case of following NUM words."
(if vhdl-upper-case-keywords (upcase-word num) (downcase-word num))) (if vhdl-upper-case-keywords (upcase-word num) (downcase-word num)))
(defun vhdl-minibuffer-tab (&optional prefix-arg) (defun vhdl-minibuffer-tab (&optional prefix-arg)
@ -10586,7 +10586,7 @@ else insert tab (used for word completion in VHDL minibuffer)."
(defun vhdl-hooked-abbrev (func) (defun vhdl-hooked-abbrev (func)
"Do function, if syntax says abbrev is a keyword, invoked by hooked abbrev, "Do function, if syntax says abbrev is a keyword, invoked by hooked abbrev,
but not if inside a comment or quote)." but not if inside a comment or quote."
(if (or (vhdl-in-literal) (if (or (vhdl-in-literal)
(save-excursion (save-excursion
(forward-word -1) (forward-word -1)
@ -12083,8 +12083,8 @@ expressions (e.g. for index ranges of types and signals)."
;; Case fixing ;; Case fixing
(defun vhdl-fix-case-region-1 (beg end upper-case word-regexp &optional count) (defun vhdl-fix-case-region-1 (beg end upper-case word-regexp &optional count)
"Convert all words matching word-regexp in region to lower or upper case, "Convert all words matching WORD-REGEXP in region to lower or upper case,
depending on parameter upper-case." depending on parameter UPPER-CASE."
(let ((case-replace nil) (let ((case-replace nil)
(last-update 0)) (last-update 0))
(vhdl-prepare-search-2 (vhdl-prepare-search-2
@ -12463,7 +12463,7 @@ File statistics: \"%s\"\n\
"Regexp to match start of construct to hide.") "Regexp to match start of construct to hide.")
(defun vhdl-hs-forward-sexp-func (count) (defun vhdl-hs-forward-sexp-func (count)
"Find end of construct to hide (for hideshow). Only searches forward." "Find end of construct to hide (for hideshow). Only searches forward."
(let ((pos (point))) (let ((pos (point)))
(vhdl-prepare-search-2 (vhdl-prepare-search-2
(beginning-of-line) (beginning-of-line)
@ -12586,7 +12586,7 @@ File statistics: \"%s\"\n\
(goto-char end)))))) (goto-char end))))))
(defun vhdl-font-lock-match-item (limit) (defun vhdl-font-lock-match-item (limit)
"Match, and move over, any declaration item after point. Adapted from "Match, and move over, any declaration item after point. Adapted from
`font-lock-match-c-style-declaration-item-and-skip-to-next'." `font-lock-match-c-style-declaration-item-and-skip-to-next'."
(condition-case nil (condition-case nil
(save-restriction (save-restriction
@ -13130,7 +13130,7 @@ hierarchy otherwise.")
(defun vhdl-scan-directory-contents (name &optional project update num-string (defun vhdl-scan-directory-contents (name &optional project update num-string
non-final) non-final)
"Scan contents of VHDL files in directory or file pattern DIR-NAME." "Scan contents of VHDL files in directory or file pattern NAME."
(string-match "\\(.*[/\\]\\)\\(.*\\)" name) (string-match "\\(.*[/\\]\\)\\(.*\\)" name)
; (unless (file-directory-p (match-string 1 name)) ; (unless (file-directory-p (match-string 1 name))
; (message "No such directory: \"%s\"" (match-string 1 name))) ; (message "No such directory: \"%s\"" (match-string 1 name)))
@ -14172,7 +14172,7 @@ if required."
) )
(defun vhdl-speedbar-insert-project-hierarchy (project indent &optional rescan) (defun vhdl-speedbar-insert-project-hierarchy (project indent &optional rescan)
"Insert hierarchy of project. Rescan directories if RESCAN is non-nil, "Insert hierarchy of PROJECT. Rescan directories if RESCAN is non-nil,
otherwise use cached data." otherwise use cached data."
(when (or rescan (and (not (assoc project vhdl-file-alist)) (when (or rescan (and (not (assoc project vhdl-file-alist))
(not (vhdl-load-cache project)))) (not (vhdl-load-cache project))))

View file

@ -3246,7 +3246,7 @@ require slightly different versions of this line."
"*Non-nil means build the reference face lists. "*Non-nil means build the reference face lists.
ps-print sets this value to nil after it builds its internal reference lists of ps-print sets this value to nil after it builds its internal reference lists of
bold and italic faces. By settings its value back to t, you can force ps-print bold and italic faces. By setting its value back to t, you can force ps-print
to rebuild the lists the next time you invoke one of the ...-with-faces to rebuild the lists the next time you invoke one of the ...-with-faces
commands. commands.

View file

@ -311,7 +311,8 @@ client \"editors\" can send your editing commands to this Emacs job.
To use the server, set up the program `emacsclient' in the To use the server, set up the program `emacsclient' in the
Emacs distribution as your standard \"editor\". Emacs distribution as your standard \"editor\".
Prefix arg means just kill any existing server communications subprocess." Optional argument LEAVE-DEAD (interactively, a prefix arg) means just
kill any existing server communications subprocess."
(interactive "P") (interactive "P")
(when server-process (when server-process
;; kill it dead! ;; kill it dead!

View file

@ -1079,7 +1079,7 @@ this command arranges for all errors to enter the debugger."
(if eval-expression-insert-value (if eval-expression-insert-value
(with-no-warnings (with-no-warnings
(let ((standard-output (current-buffer))) (let ((standard-output (current-buffer)))
(eval-last-sexp-print-value (car values)))) (prin1 (car values))))
(prog1 (prog1
(prin1 (car values) t) (prin1 (car values) t)
(let ((str (eval-expression-print-format (car values)))) (let ((str (eval-expression-print-format (car values))))

View file

@ -819,7 +819,7 @@ to toggle this value.")
(defun speedbar-make-specialized-keymap () (defun speedbar-make-specialized-keymap ()
"Create a keymap for use with a speedbar major or minor display mode. "Create a keymap for use with a speedbar major or minor display mode.
This basically creates a sparse keymap, and makes it's parent be This basically creates a sparse keymap, and makes its parent be
`speedbar-key-map'." `speedbar-key-map'."
(let ((k (make-sparse-keymap))) (let ((k (make-sparse-keymap)))
(set-keymap-parent k speedbar-key-map) (set-keymap-parent k speedbar-key-map)

View file

@ -1150,6 +1150,11 @@ Copying Conditions\tConditions for redistributing and changing Emacs
Getting New Versions\tHow to obtain the latest version of Emacs Getting New Versions\tHow to obtain the latest version of Emacs
More Manuals / Ordering Manuals Buying printed manuals from the FSF\n") More Manuals / Ordering Manuals Buying printed manuals from the FSF\n")
(:face (variable-pitch :weight bold) (:face (variable-pitch :weight bold)
"To quit a partially entered command, type "
:face default
"Control-g"
:face variable-pitch
"."
"Useful File menu items:\n" "Useful File menu items:\n"
:face variable-pitch :face variable-pitch
"Exit Emacs\t\t(Or type " "Exit Emacs\t\t(Or type "
@ -1534,6 +1539,7 @@ Warning Warning!!! Pure space overflow !!!Warning Warning
(progn (progn
(insert "\ (insert "\
You can do basic editing with the menu bar and scroll bar using the mouse. You can do basic editing with the menu bar and scroll bar using the mouse.
To quit a partially entered command, type Control-g.
Useful File menu items: Useful File menu items:
Exit Emacs (or type Control-x followed by Control-c) Exit Emacs (or type Control-x followed by Control-c)

View file

@ -52,7 +52,8 @@ A value of nil means that any change in indentation starts a new paragraph."
(defvar fill-paragraph-function nil (defvar fill-paragraph-function nil
"Mode-specific function to fill a paragraph, or nil if there is none. "Mode-specific function to fill a paragraph, or nil if there is none.
If the function returns nil, then `fill-paragraph' does its normal work.") If the function returns nil, then `fill-paragraph' does its normal work.
A value of t means explicitly \"do nothing special\".")
(defvar fill-paragraph-handle-comment t (defvar fill-paragraph-handle-comment t
"Non-nil means paragraph filling will try to pay attention to comments.") "Non-nil means paragraph filling will try to pay attention to comments.")
@ -766,7 +767,8 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling."
(barf-if-buffer-read-only) (barf-if-buffer-read-only)
(list (if current-prefix-arg 'full)))) (list (if current-prefix-arg 'full))))
;; First try fill-paragraph-function. ;; First try fill-paragraph-function.
(or (and (or fill-paragraph-function (or (and (not (eq fill-paragraph-function t))
(or fill-paragraph-function
(and (minibufferp (current-buffer)) (and (minibufferp (current-buffer))
(= 1 (point-min)))) (= 1 (point-min))))
(let ((function (or fill-paragraph-function (let ((function (or fill-paragraph-function
@ -778,7 +780,7 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling."
;; fill-paragraph-handle-comment back to t explicitly or ;; fill-paragraph-handle-comment back to t explicitly or
;; return nil. ;; return nil.
(fill-paragraph-handle-comment nil) (fill-paragraph-handle-comment nil)
fill-paragraph-function) (fill-paragraph-function t))
(funcall function arg))) (funcall function arg)))
;; Then try our syntax-aware filling code. ;; Then try our syntax-aware filling code.
(and fill-paragraph-handle-comment (and fill-paragraph-handle-comment

View file

@ -250,10 +250,9 @@ LEFT and RIGHT are the elements to compare."
;; * INSERTING AND DELETING ;; * INSERTING AND DELETING
;; C-u 8 * to insert ********. ;; C-u 8 * to insert ********.
(delete-backward-char [backspace])
(delete-backward-char "\d") (delete-backward-char "\d")
(delete-char [?\C-d]) (delete-char [?\C-d])
(backward-kill-word [(meta backspace)]) (backward-kill-word [?\M-\d])
(kill-word [?\M-d]) (kill-word [?\M-d])
(kill-line [?\C-k]) (kill-line [?\C-k])
(kill-sentence [?\M-k]) (kill-sentence [?\M-k])
@ -422,90 +421,94 @@ where
QUIET is t if this changed keybinding should be handled quietly. QUIET is t if this changed keybinding should be handled quietly.
This is used by `tutorial--display-changes'." This is used by `tutorial--display-changes'."
(let (changed-keys remark) (let (changed-keys remark)
(dolist (kdf default-keys) ;; Look up the bindings in a Fundamental mode buffer
;; The variables below corresponds to those with the same names ;; so we do not get fooled by some other major mode.
;; described in the doc string. (with-temp-buffer
(let* ((key (nth 1 kdf)) (fundamental-mode)
(def-fun (nth 0 kdf)) (dolist (kdf default-keys)
(def-fun-txt (format "%s" def-fun)) ;; The variables below corresponds to those with the same names
(rem-fun (command-remapping def-fun)) ;; described in the doc string.
(key-fun (if (eq def-fun 'ESC-prefix) (let* ((key (nth 1 kdf))
(lookup-key global-map [27]) (def-fun (nth 0 kdf))
(key-binding key))) (def-fun-txt (format "%s" def-fun))
(where (where-is-internal (if rem-fun rem-fun def-fun)))) (rem-fun (command-remapping def-fun))
(if where (key-fun (if (eq def-fun 'ESC-prefix)
(progn (lookup-key global-map [27])
(setq where (key-description (car where))) (key-binding key)))
(when (and (< 10 (length where)) (where (where-is-internal (if rem-fun rem-fun def-fun))))
(string= (substring where 0 (length "<menu-bar>")) (if where
"<menu-bar>")) (progn
(setq where "the menus"))) (setq where (key-description (car where)))
(setq where "")) (when (and (< 10 (length where))
(setq remark nil) (string= (substring where 0 (length "<menu-bar>"))
(unless "<menu-bar>"))
(cond ((eq key-fun def-fun) (setq where "the menus")))
;; No rebinding, return t (setq where ""))
t) (setq remark nil)
((and key-fun (unless
(eq key-fun (command-remapping def-fun))) (cond ((eq key-fun def-fun)
;; Just a remapping, return t ;; No rebinding, return t
t) t)
;; cua-mode specials: ((and key-fun
((and cua-mode (eq key-fun (command-remapping def-fun)))
(or (and ;; Just a remapping, return t
(equal key [?\C-v]) t)
(eq key-fun 'cua-paste)) ;; cua-mode specials:
(and ((and cua-mode
(equal key [?\C-z]) (or (and
(eq key-fun 'undo)))) (equal key [?\C-v])
(setq remark (list "cua-mode, more info" 'cua-mode)) (eq key-fun 'cua-paste))
nil) (and
((and cua-mode (equal key [?\C-z])
(or (and (eq def-fun 'ESC-prefix) (eq key-fun 'undo))))
(equal key-fun (setq remark (list "cua-mode, more info" 'cua-mode))
`(keymap nil)
(118 . cua-repeat-replace-region))) ((and cua-mode
(setq def-fun-txt "\"ESC prefix\"")) (or (and (eq def-fun 'ESC-prefix)
(and (eq def-fun 'mode-specific-command-prefix) (equal key-fun
(equal key-fun `(keymap
'(keymap (118 . cua-repeat-replace-region)))
(timeout . copy-region-as-kill))) (setq def-fun-txt "\"ESC prefix\""))
(setq def-fun-txt "\"C-c prefix\"")) (and (eq def-fun 'mode-specific-command-prefix)
(and (eq def-fun 'Control-X-prefix) (equal key-fun
(equal key-fun '(keymap
'(keymap (timeout . kill-region))) (timeout . copy-region-as-kill)))
(setq def-fun-txt "\"C-x prefix\"")))) (setq def-fun-txt "\"C-c prefix\""))
(setq remark (list "cua-mode replacement" 'cua-mode)) (and (eq def-fun 'Control-X-prefix)
(setq where "Same key") (equal key-fun
nil) '(keymap (timeout . kill-region)))
;; viper-mode specials: (setq def-fun-txt "\"C-x prefix\""))))
((and (boundp 'viper-mode-string) (setq remark (list "cua-mode replacement" 'cua-mode))
(boundp 'viper-current-state) (setq where "Same key")
(eq viper-current-state 'vi-state) nil)
(or (and (eq def-fun 'isearch-forward) ;; viper-mode specials:
(eq key-fun 'viper-isearch-forward)) ((and (boundp 'viper-mode-string)
(and (eq def-fun 'isearch-backward) (boundp 'viper-current-state)
(eq key-fun 'viper-isearch-backward)))) (eq viper-current-state 'vi-state)
;; These bindings works as the default bindings, (or (and (eq def-fun 'isearch-forward)
;; return t (eq key-fun 'viper-isearch-forward))
t) (and (eq def-fun 'isearch-backward)
((when normal-erase-is-backspace (eq key-fun 'viper-isearch-backward))))
(or (and (equal key [C-delete]) ;; These bindings works as the default bindings,
(equal key-fun 'kill-word)) ;; return t
(and (equal key [C-backspace]) t)
(equal key-fun 'backward-kill-word)))) ((when normal-erase-is-backspace
;; This is the strange handling of C-delete and (or (and (equal key [C-delete])
;; C-backspace, return t (equal key-fun 'kill-word))
t) (and (equal key [C-backspace])
(t (equal key-fun 'backward-kill-word))))
;; This key has indeed been rebound. Put information ;; This is the strange handling of C-delete and
;; in `remark' and return nil ;; C-backspace, return t
(setq remark t)
(list "more info" 'current-binding (t
key-fun def-fun key where)) ;; This key has indeed been rebound. Put information
nil)) ;; in `remark' and return nil
(add-to-list 'changed-keys (setq remark
(list key def-fun def-fun-txt where remark nil))))) (list "more info" 'current-binding
key-fun def-fun key where))
nil))
(add-to-list 'changed-keys
(list key def-fun def-fun-txt where remark nil))))))
changed-keys)) changed-keys))
(defun tutorial--key-description (key) (defun tutorial--key-description (key)
@ -621,7 +624,7 @@ with some explanatory links."
(setq file-name (concat file-name ".tut"))) (setq file-name (concat file-name ".tut")))
(expand-file-name file-name (tutorial--saved-dir)))) (expand-file-name file-name (tutorial--saved-dir))))
(defun tutorial--remove-remarks() (defun tutorial--remove-remarks ()
"Remove the remark lines that was added to the tutorial buffer." "Remove the remark lines that was added to the tutorial buffer."
(save-excursion (save-excursion
(goto-char (point-min)) (goto-char (point-min))
@ -908,7 +911,7 @@ string ids and values that are the language specific strings.
See `get-lang-string' for more information.") See `get-lang-string' for more information.")
(defun get-lang-string(lang stringid &optional no-eng-fallback) (defun get-lang-string (lang stringid &optional no-eng-fallback)
"Get a language specific string for Emacs. "Get a language specific string for Emacs.
In certain places Emacs can replace a string showed to the user with a language specific string. In certain places Emacs can replace a string showed to the user with a language specific string.
This function retrieves such strings. This function retrieves such strings.

View file

@ -1120,6 +1120,13 @@ With optional non-nil ALL, force redisplay of all mode-lines."
;;; Demo wrappers ;;; Demo wrappers
(defun type-break-catch-up-event ()
;; If the last input event is a down-event, read and discard the
;; corresponding up-event too, to avoid triggering another prompt.
(and (eventp last-input-event)
(memq 'down (event-modifiers last-input-event))
(read-event)))
;; This is a wrapper around hanoi that calls it with an arg large enough to ;; This is a wrapper around hanoi that calls it with an arg large enough to
;; make the largest discs possible that will fit in the window. ;; make the largest discs possible that will fit in the window.
;; Also, clean up the *Hanoi* buffer after we're done. ;; Also, clean up the *Hanoi* buffer after we're done.
@ -1132,9 +1139,11 @@ With optional non-nil ALL, force redisplay of all mode-lines."
(hanoi (/ (window-width) 8)) (hanoi (/ (window-width) 8))
;; Wait for user to come back. ;; Wait for user to come back.
(read-event) (read-event)
(type-break-catch-up-event)
(kill-buffer "*Hanoi*")) (kill-buffer "*Hanoi*"))
(quit (quit
(read-event) (read-event)
(type-break-catch-up-event)
(and (get-buffer "*Hanoi*") (and (get-buffer "*Hanoi*")
(kill-buffer "*Hanoi*"))))) (kill-buffer "*Hanoi*")))))
@ -1153,12 +1162,14 @@ With optional non-nil ALL, force redisplay of all mode-lines."
(life 3) (life 3)
;; wait for user to return ;; wait for user to return
(read-event) (read-event)
(type-break-catch-up-event)
(kill-buffer "*Life*")) (kill-buffer "*Life*"))
(life-extinct (life-extinct
(message "%s" (get 'life-extinct 'error-message)) (message "%s" (get 'life-extinct 'error-message))
;; restart demo ;; restart demo
(setq continue t)) (setq continue t))
(quit (quit
(type-break-catch-up-event)
(and (get-buffer "*Life*") (and (get-buffer "*Life*")
(kill-buffer "*Life*"))))))) (kill-buffer "*Life*")))))))
@ -1244,7 +1255,8 @@ With optional non-nil ALL, force redisplay of all mode-lines."
message)))) message))))
(goto-char (point-min)) (goto-char (point-min))
(sit-for 60)) (sit-for 60))
(read-event) (read-event)
(type-break-catch-up-event)
(kill-buffer buffer-name)) (kill-buffer buffer-name))
(quit (quit
(and (get-buffer buffer-name) (and (get-buffer buffer-name)

View file

@ -1,3 +1,7 @@
2007-01-29 Juanma Barranquero <lekktu@gmail.com>
* url-auth.el (url-get-authentication): Fix typo in docstring.
2007-01-14 Magnus Henoch <mange@freemail.hu> 2007-01-14 Magnus Henoch <mange@freemail.hu>
* url-proxy.el (url-proxy-object): Remove. * url-proxy.el (url-proxy-object): Remove.

View file

@ -94,7 +94,7 @@ instead of the pathname inheritance method."
(string-match "/" path)) (string-match "/" path))
(while (and byserv (not retval)) (while (and byserv (not retval))
(setq data (car (car byserv))) (setq data (car (car byserv)))
(if (or (not (string-match "/" data)) ; Its a realm - take it! (if (or (not (string-match "/" data)) ; It's a realm - take it!
(and (and
(>= (length path) (length data)) (>= (length path) (length data))
(string= data (substring path 0 (length data))))) (string= data (substring path 0 (length data)))))
@ -231,7 +231,7 @@ TYPE is the type of authentication to be returned. This is either a string
representing the type (basic, digest, etc), or nil or the symbol 'any' representing the type (basic, digest, etc), or nil or the symbol 'any'
to specify that any authentication is acceptable. If requesting 'any' to specify that any authentication is acceptable. If requesting 'any'
the strongest matching authentication will be returned. If this is the strongest matching authentication will be returned. If this is
wrong, its no big deal, the error from the server will specify exactly wrong, it's no big deal, the error from the server will specify exactly
what type of auth to use what type of auth to use
PROMPT is boolean - specifies whether to ask the user for a username/password PROMPT is boolean - specifies whether to ask the user for a username/password
if one cannot be found in the cache" if one cannot be found in the cache"

View file

@ -152,7 +152,7 @@ Only the value `maybe' can be trusted :-(."
(with-temp-buffer (with-temp-buffer
(insert-file-contents idfile) (insert-file-contents idfile)
(looking-at ".*[^ \n\t]") (looking-at ".*[^ \n\t]")
(match-string 0))) (match-string 0))
(with-current-buffer (find-file-noselect file) (with-current-buffer (find-file-noselect file)
(save-excursion (save-excursion
(goto-char (point-max)) (goto-char (point-max))
@ -161,7 +161,7 @@ Only the value `maybe' can be trusted :-(."
(goto-char (point-min)) (goto-char (point-min))
(re-search-forward vc-arch-tagline-re (+ (point) 1000) t))) (re-search-forward vc-arch-tagline-re (+ (point) 1000) t)))
(match-string 1) (match-string 1)
(concat "./" (file-relative-name file (vc-arch-root file)))))))) (concat "./" (file-relative-name file (vc-arch-root file)))))))))
(defun vc-arch-tagging-method (file) (defun vc-arch-tagging-method (file)
(with-current-buffer (with-current-buffer

View file

@ -1,3 +1,10 @@
2007-01-30 Robert J. Chassell <bob@rattlesnake.com>
* emacs-lisp-intro.texi (else): Rephrase message of first
if-then-else example so it is right both in itself and in the
"true" case of the expression, which asks whether 4 is greater
than 5.
2006-11-27 Andreas Schwab <schwab@suse.de> 2006-11-27 Andreas Schwab <schwab@suse.de>
* Makefile.in (usermanualdir): Define. * Makefile.in (usermanualdir): Define.

View file

@ -7,6 +7,26 @@
% Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1 % Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
% %
% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
% Free Software Foundation, Inc.
%
% 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., 51 Franklin Street, Fifth Floor,
% Boston, MA 02110-1301, USA.
/tgifdict 132 dict def /tgifdict 132 dict def
tgifdict begin tgifdict begin

View file

@ -7,6 +7,26 @@
% Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1 % Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
% %
% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
% Free Software Foundation, Inc.
%
% 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., 51 Franklin Street, Fifth Floor,
% Boston, MA 02110-1301, USA.
/tgifdict 132 dict def /tgifdict 132 dict def
tgifdict begin tgifdict begin

View file

@ -7,6 +7,26 @@
% Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1 % Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
% %
% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
% Free Software Foundation, Inc.
%
% 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., 51 Franklin Street, Fifth Floor,
% Boston, MA 02110-1301, USA.
/tgifdict 132 dict def /tgifdict 132 dict def
tgifdict begin tgifdict begin

View file

@ -7,6 +7,26 @@
% Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1 % Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
% %
% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
% Free Software Foundation, Inc.
%
% 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., 51 Franklin Street, Fifth Floor,
% Boston, MA 02110-1301, USA.
/tgifdict 132 dict def /tgifdict 132 dict def
tgifdict begin tgifdict begin

View file

@ -7,6 +7,26 @@
% Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1 % Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
% %
% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
% Free Software Foundation, Inc.
%
% 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., 51 Franklin Street, Fifth Floor,
% Boston, MA 02110-1301, USA.
/tgifdict 132 dict def /tgifdict 132 dict def
tgifdict begin tgifdict begin

View file

@ -9,6 +9,26 @@
%%EndComments %%EndComments
%%BeginProlog %%BeginProlog
% Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
% Free Software Foundation, Inc.
%
% 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., 51 Franklin Street, Fifth Floor,
% Boston, MA 02110-1301, USA.
/tgifdict 53 dict def /tgifdict 53 dict def
tgifdict begin tgifdict begin

View file

@ -4112,9 +4112,9 @@ is not greater than 5!} when you evaluate it in the usual way:
@smallexample @smallexample
@group @group
(if (> 4 5) ; @r{if-part} (if (> 4 5) ; @r{if-part}
(message "5 is greater than 4!") ; @r{then-part} (message "4 falsely greater than 5!") ; @r{then-part}
(message "4 is not greater than 5!")) ; @r{else-part} (message "4 is not greater than 5!")) ; @r{else-part}
@end group @end group
@end smallexample @end smallexample

View file

@ -7,6 +7,26 @@
% Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1 % Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
% %
% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
% Free Software Foundation, Inc.
%
% 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., 51 Franklin Street, Fifth Floor,
% Boston, MA 02110-1301, USA.
/tgifdict 132 dict def /tgifdict 132 dict def
tgifdict begin tgifdict begin

View file

@ -7,6 +7,26 @@
% Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1 % Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
% %
% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
% Free Software Foundation, Inc.
%
% 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., 51 Franklin Street, Fifth Floor,
% Boston, MA 02110-1301, USA.
/tgifdict 132 dict def /tgifdict 132 dict def
tgifdict begin tgifdict begin

View file

@ -7,6 +7,26 @@
% Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1 % Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
% %
% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
% Free Software Foundation, Inc.
%
% 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., 51 Franklin Street, Fifth Floor,
% Boston, MA 02110-1301, USA.
/tgifdict 132 dict def /tgifdict 132 dict def
tgifdict begin tgifdict begin

View file

@ -1,3 +1,19 @@
2007-01-29 Eli Zaretskii <eliz@gnu.org>
* elisp.texi (Top): Add "Standard Errors", "Standard Buffer-Local
Variables", and "Standard Keymaps" to the detailed menu.
* variables.texi (Future Local Variables): Add index entry.
2007-01-28 Richard Stallman <rms@gnu.org>
* tips.texi (Coding Conventions): Clarify the tip about macros
that define a function or a variable.
* files.texi (File Attributes): UID and GID can be floats.
(Magic File Names): Explain why deferring all operations to
the standard handler does not work.
2007-01-23 Martin Rudalics <rudalics@gmx.at> 2007-01-23 Martin Rudalics <rudalics@gmx.at>
* backups.texi (Reverting): Use "buffer" instead of "file" * backups.texi (Reverting): Use "buffer" instead of "file"

View file

@ -365,6 +365,7 @@ Errors
* Processing of Errors:: What Emacs does when you report an error. * Processing of Errors:: What Emacs does when you report an error.
* Handling Errors:: How you can trap errors and continue execution. * Handling Errors:: How you can trap errors and continue execution.
* Error Symbols:: How errors are classified for trapping them. * Error Symbols:: How errors are classified for trapping them.
* Standard Errors:: List of all error symbols.
Variables Variables
@ -386,6 +387,8 @@ Variables
* Variable Aliases:: Variables that are aliases for other variables. * Variable Aliases:: Variables that are aliases for other variables.
* Variables with Restricted Values:: Non-constant variables whose value can * Variables with Restricted Values:: Non-constant variables whose value can
@emph{not} be an arbitrary Lisp object. @emph{not} be an arbitrary Lisp object.
* Standard Buffer-Local Variables::
List of variables buffer-local in all buffers.
Scoping Rules for Variable Bindings Scoping Rules for Variable Bindings
@ -617,8 +620,9 @@ Keymaps
* Remapping Commands:: A keymap can translate one command to another. * Remapping Commands:: A keymap can translate one command to another.
* Key Binding Commands:: Interactive interfaces for redefining keys. * Key Binding Commands:: Interactive interfaces for redefining keys.
* Scanning Keymaps:: Looking through all keymaps, for printing help. * Scanning Keymaps:: Looking through all keymaps, for printing help.
* Menu Keymaps:: A keymap can define a menu for X * Menu Keymaps:: A keymap can define a menu for X
or for use from the terminal. or for use from the terminal.
* Standard Keymaps:: List of standard keymaps.
Major and Minor Modes Major and Minor Modes

View file

@ -1157,11 +1157,12 @@ links, can be created by using the @code{add-name-to-file} function
(@pxref{Changing Files}). (@pxref{Changing Files}).
@item @item
The file's @acronym{UID} as a string or an integer. If a string The file's @acronym{UID}, normally as a string. However, if it does
value cannot be looked up, the integer value is returned. not correspond to a named user, the value is an integer or a floating
point number.
@item @item
The file's @acronym{GID} likewise. The file's @acronym{GID}, likewise.
@item @item
The time of last access, as a list of two integers. The time of last access, as a list of two integers.
@ -2554,7 +2555,7 @@ whose match starts last in the file name gets precedence. This rule
is chosen so that handlers for jobs such as uncompression are handled is chosen so that handlers for jobs such as uncompression are handled
first, before handlers for jobs such as remote file access. first, before handlers for jobs such as remote file access.
Here are the operations that a magic file name handler gets to handle: Here are the operations that a magic file name handler gets to handle:
@ifnottex @ifnottex
@noindent @noindent
@ -2704,6 +2705,14 @@ avoids inefficiency, but its main purpose is for autoloaded handler
functions, so that they won't be loaded except when they have real functions, so that they won't be loaded except when they have real
work to do. work to do.
Simply deferring all operations to the usual primitives does not
work. For instance, if the file name handler applies to
@code{file-exists-p}, then it must handle @code{load} itself, because
the usual @code{load} code won't work properly in that case. However,
if the handler uses the @code{operations} property to say it doesn't
handle @code{file-exists-p}, then it need not handle @code{load}
nontrivially.
@defvar inhibit-file-name-handlers @defvar inhibit-file-name-handlers
This variable holds a list of handlers whose use is presently inhibited This variable holds a list of handlers whose use is presently inhibited
for a certain operation. for a certain operation.

View file

@ -210,7 +210,8 @@ Constructs that define a function or variable should be macros,
not functions, and their names should start with @samp{def}. not functions, and their names should start with @samp{def}.
@item @item
Macros that define a function or variable should take the name to be A macro that defines a function or variable should have a name that
starts with @samp{define-}. The macro should receive the name to be
defined as the first argument. That will help various tools find the defined as the first argument. That will help various tools find the
definition automatically. Avoid constructing the names in the macro definition automatically. Avoid constructing the names in the macro
itself, since that would confuse these tools. itself, since that would confuse these tools.

View file

@ -1644,6 +1644,7 @@ local bindings, we will provide it in a subsequent Emacs version.
@node File Local Variables @node File Local Variables
@section File Local Variables @section File Local Variables
@cindex file local variables
A file can specify local variable values; Emacs uses these to create A file can specify local variable values; Emacs uses these to create
buffer-local bindings for those variables in the buffer visiting that buffer-local bindings for those variables in the buffer visiting that

View file

@ -1,3 +1,7 @@
2007-01-30 Piet van Oostrum <piet@cs.uu.nl>
* make-package (compver): Install info and manpages.
2006-12-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> 2006-12-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* inc/config.h: Sync with src/config.in. * inc/config.h: Sync with src/config.in.

View file

@ -1,3 +1,25 @@
<!--
Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
Free Software Foundation, Inc.
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., 51 Franklin Street, Fifth Floor, Boston,
MA 02110-1301, USA.
-->
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd"> <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
<plist version="0.9"> <plist version="0.9">

View file

@ -330,6 +330,8 @@ compver=powerpc-apple-darwin`uname -r`
if test "$self_contained" = "yes"; then if test "$self_contained" = "yes"; then
# Move shared files down to Resources directory # Move shared files down to Resources directory
mv $installprefix/share/emacs/$version/* $installprefix mv $installprefix/share/emacs/$version/* $installprefix
mv $installprefix/share/info $installprefix
mv $installprefix/share/man $installprefix
rm -rf $installprefix/share rm -rf $installprefix/share
# These directories might remain in Resources # These directories might remain in Resources
mv $installprefix/bin $installprefix/../MacOS/bin mv $installprefix/bin $installprefix/../MacOS/bin

View file

@ -1,3 +1,18 @@
2007-01-29 Chong Yidong <cyd@stupidchicken.com>
* frames.texi (Secondary Selection): Window clicked does not matter
when mouse-yank-at-point is non-nil.
2007-01-28 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>
* gnus.texi (Batching Agents): Fix example. Reported by Tassilo Horn
<tassilo@member.fsf.org>.
2007-01-27 Eli Zaretskii <eliz@gnu.org>
* msdog.texi (ls in Lisp): Document ls-lisp-format-time-list and
ls-lisp-use-localized-time-format.
2007-01-20 Markus Triska <markus.triska@gmx.at> 2007-01-20 Markus Triska <markus.triska@gmx.at>
* flymake.texi (Flymake mode): find-file-hook instead of ...-hooks. * flymake.texi (Flymake mode): find-file-hook instead of ...-hooks.

View file

@ -307,9 +307,9 @@ yanked text.
Double or triple clicking of @kbd{M-Mouse-1} operates on words and Double or triple clicking of @kbd{M-Mouse-1} operates on words and
lines, much like @kbd{Mouse-1}. lines, much like @kbd{Mouse-1}.
If @code{mouse-yank-at-point} is non-@code{nil}, @kbd{M-Mouse-2} If @code{mouse-yank-at-point} is non-@code{nil}, @kbd{M-Mouse-2} yanks
yanks at point. Then it does not matter precisely where you click; all at point. Then it does not matter precisely where you click, or even
that matters is which window you click on. @xref{Mouse Commands}. which of the frame's windows you click on. @xref{Mouse Commands}.
@node Clipboard @node Clipboard
@subsection Using the Clipboard @subsection Using the Clipboard

Some files were not shown because too many files have changed in this diff Show more