1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-23 07:19:15 +00:00

Merged from miles@gnu.org--gnu-2005 (patch 118-132, 551-577)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-551
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-552
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-553
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-554
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-555
   Remove CVS keywords from newsticker files

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-556
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-557
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-558
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-559
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-560
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-561
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-562
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-563
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-564
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-565
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-566
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-567
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-568
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-569
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-570
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-571
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-572
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-573
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-574
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-575
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-576
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-577
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-118
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-119
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-120
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-121
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-122
   Update from CVS: lisp/mm-url.el (mm-url-decode-entities): Fix regexp.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-123
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-124
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-125
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-126
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-127
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-128
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-129
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-130
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-131
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-132
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-423
This commit is contained in:
Karoly Lorentey 2005-10-09 20:00:17 +00:00
commit 0ff21b4e57
391 changed files with 11190 additions and 6453 deletions

View File

@ -1,3 +1,9 @@
2005-10-04 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* configure.in: Prefer Carbon if --enable-carbon-app or
--with-carbon is explicitly specified even when X11 is detected.
* configure: Regenerate.
2005-09-15 Ulf Jasper <ulf.jasper@web.de>
* Makefile.in (install-arch-indep, uninstall):

View File

@ -1,3 +1,7 @@
2005-10-01 Jason Rumney <jasonr@gnu.org>
* admin.el (set-version): Set version numbers in nt/emacs.rc.
2005-08-31 Romain Francoise <romain@orebokech.com>
* FOR-RELEASE: (New features): Remove vhdl-mode.el update

View File

@ -27,7 +27,24 @@ face name prefixes should be in it for good results.
* NEW FEATURES
** Update Speedbar.
** Rework how the fringe "angle" bitmap at at bottom of buffer is
shown to include an indication of whether the last line has a NL or not.
[Assigned to KFS]
** Rework how fringe bitmaps are defined and used.
Currently, bitmap usage and bitmap appearence are "mixed-up" in a
one-level representation. It would be cleaner to split the
representation into a two-level model where first level maps
bitmap usage to a bitmap name, and second level maps bitmap name to
a bitmap appearence.
[Assigned to KFS]
** Put a max-limit on the size of images, e.g. based on the display size.
This is to avoid allocating insane amounts of memory due to bogus
image size specifications.
Note: rather than clipping images that are too big (this may be
non-trivial to do correctly in all cases -- and thus non-trivial to
test), it may be better just to avoid displaying such images for emacs 22.
* FATAL ERRORS
@ -48,59 +65,17 @@ back burner waiting for a legal comment or an alternate implementation
* BUGS
** Fix recognition of shell's `dirs' command.
* Pierre Albarede's Aug 30 bug report about C-v and long lines.
Is his change right?
Date: Wed, 29 Jun 2005 18:21:28 -0500 (CDT)
From: kevin.gal@verizon.net
When I use tcsh (which echoes command input) in a shell buffer,
entering "M-x dirs" fails because it mistakens the echoed "dirs"
string as the directory string to use as input when changing the
buffers default directory. The attached gziped patch file contains a
fix. The patch also binds the "dirs" command to "\e\C-m" in
shell-mode-map (previously unbound) to make it easy to invoke.
Finally, a test has been added to see if "shell-dirstack-query" is
non-nil. If so, it is not overwritten.
To enable the fix, the user must set comint-process-echoes to t.
** Make a new interface for specifying window configurations
so that we can fix bugs in balance-windows.
** TCP server processes do not work on Windows.
TCP/IP server processes created with `make-network-process' consume
excesive CPU on some Windows environments. Usages of 50% and 100%
CPU time have been observed on different Window XP configurations.
** Bug in ebrowse
Date: Fri, 27 May 2005 17:35:48 +0200
From: Markus Gritsch <gritsch@iue.tuwien.ac.at>
the C++ header file which led to the problematic BROWSE file reads
namespace test {
class Base
{
};
class B : public Base
{
};
}
class A : public test::Base
{
};
The *Tree* is then displayed as
*Globals*
test
test::Base
test::B
The class A seems to be missing.
Seems to be a problem in sys_select in w32proc.c.
* DOCUMENTATION
@ -221,7 +196,7 @@ lispref/debugging.texi Joakim Verona <joakim@verona.se> Lute Kamstra
lispref/display.texi Chong Yidong
lispref/edebug.texi Chong Yidong "Luc Teirlinck"
lispref/elisp.texi "Luc Teirlinck" Lute Kamstra
lispref/errors.texi "Luc Teirlinck"
lispref/errors.texi "Luc Teirlinck" Chong Yidong
lispref/eval.texi "Luc Teirlinck" Chong Yidong
lispref/files.texi "Luc Teirlinck" Chong Yidong
lispref/frames.texi "Luc Teirlinck" Chong Yidong
@ -236,7 +211,7 @@ lispref/lists.texi "Luc Teirlinck" Chong Yidong
lispref/loading.texi "Luc Teirlinck" Chong Yidong
lispref/locals.texi Chong Yidong
lispref/macros.texi "Luc Teirlinck" Chong Yidong
lispref/maps.texi
lispref/maps.texi Chong Yidong
lispref/markers.texi "Luc Teirlinck" Chong Yidong
lispref/minibuf.texi "Luc Teirlinck" Chong Yidong
lispref/modes.texi Chong Yidong

View File

@ -87,7 +87,36 @@ Root must be the root of an Emacs source tree."
(submatch (1+ (in "0-9."))))))
(set-version-in-file root "lispref/elisp.texi" version
(rx (and "EMACSVER" (1+ space)
(submatch (1+ (in "0-9.")))))))
(submatch (1+ (in "0-9."))))))
;; nt/emacs.rc also contains the version number, but in an awkward
;; format. It must contain four components, separated by commas, and
;; in two places those commas are followed by space, in two other
;; places they are not.
(let* ((version-components (append (split-string version "\\.")
'("0" "0")))
(comma-version
(concat (car version-components) ","
(cadr version-components) ","
(cadr (cdr version-components)) ","
(cadr (cdr (cdr version-components)))))
(comma-space-version
(concat (car version-components) ", "
(cadr version-components) ", "
(cadr (cdr version-components)) ", "
(cadr (cdr (cdr version-components))))))
(set-version-in-file root "nt/emacs.rc" comma-version
(rx (and "FILEVERSION" (1+ space)
(submatch (1+ (in "0-9,"))))))
(set-version-in-file root "nt/emacs.rc" comma-version
(rx (and "PRODUCTVERSION" (1+ space)
(submatch (1+ (in "0-9,"))))))
(set-version-in-file root "nt/emacs.rc" comma-space-version
(rx (and "\"FileVersion\"" (0+ space) ?, (0+ space)
?\" (submatch (1+ (in "0-9, "))) "\\0\"")))
(set-version-in-file root "nt/emacs.rc" comma-space-version
(rx (and "\"ProductVersion\"" (0+ space) ?,
(0+ space) ?\" (submatch (1+ (in "0-9, ")))
"\\0\"")))))
;;; arch-tag: 4ea83636-2293-408b-884e-ad64f22a3bf5
;; admin.el ends here.

98
configure vendored
View File

@ -8197,52 +8197,9 @@ else
fi
fi
case "${window_system}" in
x11 )
HAVE_X_WINDOWS=yes
HAVE_X11=yes
case "${with_x_toolkit}" in
athena | lucid ) USE_X_TOOLKIT=LUCID ;;
motif ) USE_X_TOOLKIT=MOTIF ;;
gtk ) with_gtk=yes
USE_X_TOOLKIT=none ;;
no ) USE_X_TOOLKIT=none ;;
* ) USE_X_TOOLKIT=maybe ;;
esac
;;
none )
HAVE_X_WINDOWS=no
HAVE_X11=no
USE_X_TOOLKIT=none
;;
esac
### If we're using X11, we should use the X menu package.
HAVE_MENUS=no
case ${HAVE_X11} in
yes ) HAVE_MENUS=yes ;;
esac
if test "${opsys}" = "hpux9"; then
case "${x_libraries}" in
*X11R4* )
opsysfile="s/hpux9-x11r4.h"
;;
esac
fi
if test "${opsys}" = "hpux9shr"; then
case "${x_libraries}" in
*X11R4* )
opsysfile="s/hpux9shxr4.h"
;;
esac
fi
HAVE_CARBON=no
if test "${HAVE_X11}" != "yes"; then
if test "${with_carbon}" != "no"; then
if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
if test "${with_carbon}" != no; then
if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
@ -8384,8 +8341,58 @@ if test $ac_cv_header_Carbon_Carbon_h = yes; then
fi
fi
if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
if test "${with_carbon+set}" != set \
&& test "${carbon_appdir_x+set}" != set; then
HAVE_CARBON=no
fi
fi
if test "${HAVE_CARBON}" = yes; then
window_system=mac
fi
case "${window_system}" in
x11 )
HAVE_X_WINDOWS=yes
HAVE_X11=yes
case "${with_x_toolkit}" in
athena | lucid ) USE_X_TOOLKIT=LUCID ;;
motif ) USE_X_TOOLKIT=MOTIF ;;
gtk ) with_gtk=yes
USE_X_TOOLKIT=none ;;
no ) USE_X_TOOLKIT=none ;;
* ) USE_X_TOOLKIT=maybe ;;
esac
;;
mac | none )
HAVE_X_WINDOWS=no
HAVE_X11=no
USE_X_TOOLKIT=none
;;
esac
### If we're using X11, we should use the X menu package.
HAVE_MENUS=no
case ${HAVE_X11} in
yes ) HAVE_MENUS=yes ;;
esac
if test "${opsys}" = "hpux9"; then
case "${x_libraries}" in
*X11R4* )
opsysfile="s/hpux9-x11r4.h"
;;
esac
fi
if test "${opsys}" = "hpux9shr"; then
case "${x_libraries}" in
*X11R4* )
opsysfile="s/hpux9shxr4.h"
;;
esac
fi
### Compute the unexec source name from the object name.
UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
@ -12716,7 +12723,6 @@ cat >>confdefs.h <<\_ACEOF
#define HAVE_CARBON 1
_ACEOF
window_system=mac
## Specify the install directory
carbon_appdir=
if test "${carbon_appdir_x}" != ""; then

View File

@ -1668,6 +1668,20 @@ else
fi
fi
HAVE_CARBON=no
if test "${with_carbon}" != no; then
AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
fi
if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
if test "${with_carbon+set}" != set \
&& test "${carbon_appdir_x+set}" != set; then
HAVE_CARBON=no
fi
fi
if test "${HAVE_CARBON}" = yes; then
window_system=mac
fi
case "${window_system}" in
x11 )
HAVE_X_WINDOWS=yes
@ -1686,7 +1700,7 @@ dnl make this decision later: use the toolkit if we have X11R5 or newer.
* ) USE_X_TOOLKIT=maybe ;;
esac
;;
none )
mac | none )
HAVE_X_WINDOWS=no
HAVE_X11=no
USE_X_TOOLKIT=none
@ -1715,13 +1729,6 @@ if test "${opsys}" = "hpux9shr"; then
esac
fi
HAVE_CARBON=no
if test "${HAVE_X11}" != "yes"; then
if test "${with_carbon}" != "no"; then
AC_CHECK_HEADER(Carbon/Carbon.h, HAVE_CARBON=yes)
fi
fi
### Compute the unexec source name from the object name.
UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
@ -2345,7 +2352,6 @@ AC_CHECK_HEADER(malloc/malloc.h, AC_DEFINE(HAVE_MALLOC_MALLOC_H, 1, [Define to 1
### Use Mac OS X Carbon API to implement GUI.
if test "${HAVE_CARBON}" = "yes"; then
AC_DEFINE(HAVE_CARBON, 1, [Define to 1 if you are using the Carbon API on Mac OS X.])
window_system=mac
## Specify the install directory
carbon_appdir=
if test "${carbon_appdir_x}" != ""; then

View File

@ -1,7 +1,66 @@
2005-10-02 Stefan Monnier <monnier@iro.umontreal.ca>
* TODO: Clarify the local variables entry.
2005-09-30 Bill Wohler <wohler@newt.com>
Moved MH-E image files from toolbar and mail directories into
etc/images.
* images/mail: New directory.
* images/mail/reply.*: Moved here from lisp/mail/reply2*.
* images/mail/alias.*, images/mail/refile.*, images/mail/repack.*:
* images/mail/reply*: Moved here from lisp/toolbar.
* images/execute.*, images/highlight.*, images/mh-logo.xpm:
* images/page-down.*, images/show.*, images/widen.*: Moved here
from lisp/toolbar.
* images/refresh.*: Moved here from lisp/toolbar/rescan.*.
Use GNOME 2.10's refresh icon.
* images/README: New file that indicates which icons came from
GNOME (see lisp/toolbar/README).
2005-09-30 Romain Francoise <romain@orebokech.com>
* NEWS: Mention changes to `read-buffer'.
2005-09-30 Chong Yidong <cyd@stupidchicken.com>
* images/ezimage: New directory.
* images/ezimage/*.xpm: Add images used by speedbar.el.
2005-09-30 David Ponce <david@dponce.com>
* NEWS: Update recentf changes.
2005-09-28 Simon Josefsson <jas@extundo.com>
* GNUS-NEWS: Fix IDNA notes.
2005-09-27 Jay Belanger <belanger@truman.edu>
* calccard.tex: Update `versionnumber', remove `versiondate'.
(Error Recovery): Refer to "initial state" rather than "default state".
(Algebra): Mention LaTeX language mode.
(Programming): Delete reference to "Z =".
2005-09-24 Steven Huwig <steven_h@acm.org> (tiny change)
* emacs.py (ehelp): Add g and l to arg list, and use them in the
call to `help'.
2005-09-17 Romain Francoise <romain@orebokech.com>
* gfdl.1: Update to version 1.2. Delete UC macro.
2005-09-15 Kenichi Handa <handa@m17n.org>
* PROBLEMS: Fix the paragraph describing the limitation of
UTF-8/16/7.
* PROBLEMS: Fix the paragraph describing the limitation of UTF-8/16/7.
2005-09-14 Romain Francoise <romain@orebokech.com>
@ -103,12 +162,11 @@
2005-07-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* PROBLEMS (Fedora Core 4 GNU/Linux: Segfault during dumping):
Added it again.
Add it again.
2005-06-29 Carsten Dominik <dominik@science.uva.nl>
* NEWS: Added an entry for Org-mode, and a change entry for
reftex-mode.
* NEWS: Add an entry for Org-mode, and a change entry for reftex-mode.
2005-06-28 Richard M. Stallman <rms@gnu.org>

View File

@ -142,10 +142,10 @@ The new make.bat makes make-x.bat superfluous, so it has been removed.
** Support for non-ASCII domain names
Message supports non-ASCII domain names in From:, To: and Cc: and will
query you whether to perform encoding when you try to send a message.
The variable `message-use-idna' controls this. Gnus will also decode
non-ASCII domain names in From:, To: and Cc: when you view a message.
The variable `gnus-use-idna' controls this.
encode them when you try to send a message. The variable
`message-use-idna' controls this. Gnus will also decode non-ASCII
domain names in From:, To: and Cc: when you view a message. The
variable `gnus-use-idna' controls this.
** Better handling of Microsoft citation styles

View File

@ -2556,14 +2556,19 @@ The recent file list is now automatically cleanup when recentf mode is
enabled. The new option `recentf-auto-cleanup' controls when to do
automatic cleanup.
The ten most recent files can be quickly opened by using the shortcut
keys 1 to 9, and 0, when the recent list is displayed in a buffer via
the `recentf-open-files', or `recentf-open-more-files' commands.
The `recentf-keep' option replaces `recentf-keep-non-readable-files-p'
and provides a more general mechanism to customize which file names to
keep in the recent list.
With the more advanced option: `recentf-filename-handler', you can
specify a function that transforms filenames handled by recentf. For
example, if set to `file-truename', the same file will not be in the
recent list with different symbolic links.
With the more advanced option `recentf-filename-handlers', you can
specify functions that successively transform recent file names. For
example, if set to `file-truename' plus `abbreviate-file-name', the
same file will not be in the recent list with different symbolic
links, and the file name will be abbreviated.
To follow naming convention, `recentf-menu-append-commands-flag'
replaces the misnamed option `recentf-menu-append-commands-p'. The
@ -3694,6 +3699,12 @@ If the variable is itself nil, then `frame-or-buffer-changed-p' uses,
for compatibility, an internal variable which exists only for this
purpose.
+++
*** The function `read-buffer' follows the convention for reading from
the minibuffer with a default value: if DEF is non-nil, the minibuffer
prompt provided in PROMPT is edited to show the default value provided
in DEF before the terminal colon and space.
** Local variables lists:
+++
@ -4341,6 +4352,9 @@ buffer.
If non-nil, that says to preserve the window's current margin, fringe,
and scroll-bar settings.
+++
*** The new function `window-split-tree' returns a frame's window split tree.
+++
** Customizable fringe bitmaps

View File

@ -47,7 +47,7 @@ to the FSF.
** Implement something better than the current Refill mode. This
probably needs some primitive support.
** Add a command to make a local variables list in the current buffer
** Add a command to make a "Local Variables" section in the current buffer
and/or add a variable to the list.
** Implement primitive and higher-level functions to allow filling

View File

@ -59,8 +59,7 @@
% UUCP: mit-erl!gildea
% Internet: gildea@stop.mail-abuse.org
\def\versionnumber{2.03}
\def\versiondate{November 2001}
\def\versionnumber{2.1}
\def\year{2005}
\def\version{v\versionnumber}
@ -72,7 +71,7 @@
\vskip 1ex plus 2 fill\begingroup\small
\centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
\centerline{designed by Dave Gillespie and Stephen Gildea, \version}
\centerline{for GNU Emacs Calc version \versionnumber\ (\versiondate)}
\centerline{for GNU Emacs Calc version \versionnumber}
Permission is granted to make and distribute copies of
this card provided the copyright notice and this permission notice
@ -274,7 +273,7 @@
\title{GNU Calc Reference Card}
\centerline{(for version \versionnumber\ of \versiondate)}
\centerline{(for version \versionnumber)}
\section{Starting and Stopping}
@ -307,7 +306,7 @@ \section{Error Recovery}
\key{redo last operation}{D}
\key{recall last arguments}{M-RET}
\key{edit top of stack}{`}
\wkey{reset Calc to default state}{\mhash 0 {\rm (zero)}}
\wkey{reset Calc to initial state}{\mhash 0 {\rm (zero)}}
\section{Transferring Data}
@ -558,7 +557,7 @@ \section{Algebra}
\key{``Big'' display mode}{d B}
\key{C, Pascal, FORTRAN modes}{d C\, d P\, d F}
\key{\TeX, eqn modes}{d T\, d E}
\key{\TeX, La\TeX, eqn modes}{d T\, d L\, d E}
\key{Unformatted mode}{d U}
\key{Normal language mode}{d N}
@ -652,7 +651,6 @@ \section{Programming}
\key{repeat {\it n} times, break from loop}{Z <\, Z >\, Z /}
\key{``for'' loop: start, end; body, step}{Z (\, Z )}
\key{save, restore mode settings}{Z `\, Z '}
\key{display message during macro}{Z =}
\key{query user during macro}{Z \#}
\key{put finished macro on a key}{Z K}

View File

@ -82,11 +82,11 @@ def complete (text, namespace = None):
except:
print '_emacs_out ()'
def ehelp (name):
"""Get help on string NAME.
def ehelp (name, g, l):
"""Get help on string NAME using globals G and locals L.
First try to eval name for, e.g. user definitions where we need
the object. Otherwise try the string form."""
try: help (eval (name))
try: help (eval (name, g, l))
except: help (name)
def eimport (mod, dir):

View File

@ -93,28 +93,31 @@ and create tags for extern variables unless \-\-no\-globals is used.
.TP
.B \-d, \-\-defines
Create tag entries for C preprocessor constant definitions
and enum constants, too. This is the
default behavior for \fBetags\fP.
and enum constants, too. Since this is the default behavior of
\fBetags\fP, only \fBctags\fP accepts this option.
.TP
.B \-D, \-\-no\-defines
Do not create tag entries for C preprocessor constant definitions
and enum constants.
This may make the tags file much smaller if many header files are tagged.
This is the default behavior for \fBctags\fP.
Since this is the default behavior of \fBctags\fP, only \fBetags\fP
accepts this option.
.TP
.B \-g, \-\-globals
.B \-\-globals
Create tag entries for global variables in C, C++, Objective C, Java,
and Perl.
This is the default behavior for \fBetags\fP.
Since this is the default behavior of \fBetags\fP, only \fBctags\fP
accepts this option.
.TP
.B \-G, \-\-no\-globals
.B \-\-no\-globals
Do not tag global variables. Typically this reduces the file size by
one fourth. This is the default behavior for \fBctags\fP.
one fourth. Since this is the default behavior of \fBctags\fP, only
\fBetags\fP accepts this option.
.TP
\fB\-i\fP \fIfile\fP, \fB\-\-include=\fIfile\fP
Include a note in the tag file indicating that, when searching for a
tag, one should also consult the tags file \fIfile\fP after checking the
current file. This options is only accepted by \fBetags\fP.
current file. Only \fBetags\fP accepts this option.
.TP
.B \-I, \-\-ignore\-indentation
Don't rely on indentation as much as we normally do. Currently, this

View File

@ -1,10 +1,9 @@
.TH GFDL 1 "2001 April 23"
.UC 4
.TH GFDL 1 "2005 September 17"
.SH NAME
GFDL \- The GNU Free Documentation License
.ce
Version 1.1, March 2000
Version 1.2, November 2002
.hy 0
.na
@ -23,12 +22,12 @@ of this license document, but changing it is not allowed.
.SH 0. PREAMBLE
The purpose of this License is to make a manual, textbook, or other
written document "free" in the sense of freedom: to assure everyone
the effective freedom to copy and redistribute it, with or without
modifying it, either commercially or noncommercially. Secondarily,
this License preserves for the author and publisher a way to get
credit for their work, while not being considered responsible for
modifications made by others.
functional and useful document "free" in the sense of freedom: to
assure everyone the effective freedom to copy and redistribute it,
with or without modifying it, either commercially or noncommercially.
Secondarily, this License preserves for the author and publisher a way
to get credit for their work, while not being considered responsible
for modifications made by others.
This License is a kind of "copyleft", which means that derivative
works of the document must themselves be free in the same sense. It
@ -45,11 +44,15 @@ principally for works whose purpose is instruction or reference.
.SH 1. APPLICABILITY AND DEFINITIONS
This License applies to any manual or other work that contains a
notice placed by the copyright holder saying it can be distributed
under the terms of this License. The "Document", below, refers to any
such manual or work. Any member of the public is a licensee, and is
addressed as "you."
This License applies to any manual or other work, in any medium, that
contains a notice placed by the copyright holder saying it can be
distributed under the terms of this License. Such a notice grants a
world-wide, royalty-free license, unlimited in duration, to use that
work under the conditions stated herein. The "Document", below,
refers to any such manual or work. Any member of the public is a
licensee, and is addressed as "you". You accept the license if you
copy, modify or distribute the work in a way requiring permission
under copyright law.
A "Modified Version" of the Document means any work containing the
Document or a portion of it, either copied verbatim, or with
@ -59,7 +62,7 @@ A "Secondary Section" is a named appendix or a front-matter section of
the Document that deals exclusively with the relationship of the
publishers or authors of the Document to the Document's overall subject
(or to related matters) and contains nothing that could fall directly
within that overall subject. (For example, if the Document is in part a
within that overall subject. (Thus, if the Document is in part a
textbook of mathematics, a Secondary Section may not explain any
mathematics.) The relationship could be a matter of historical
connection with the subject or with related matters, or of legal,
@ -68,33 +71,40 @@ them.
The "Invariant Sections" are certain Secondary Sections whose titles
are designated, as being those of Invariant Sections, in the notice
that says that the Document is released under this License.
that says that the Document is released under this License. If a
section does not fit the above definition of Secondary then it is not
allowed to be designated as Invariant. The Document may contain zero
Invariant Sections. If the Document does not identify any Invariant
Sections then there are none.
The "Cover Texts" are certain short passages of text that are listed,
as Front-Cover Texts or Back-Cover Texts, in the notice that says that
the Document is released under this License.
the Document is released under this License. A Front-Cover Text may
be at most 5 words, and a Back-Cover Text may be at most 25 words.
A "Transparent" copy of the Document means a machine-readable copy,
represented in a format whose specification is available to the
general public, whose contents can be viewed and edited directly and
general public, that is suitable for revising the document
straightforwardly with generic text editors or (for images composed of
pixels) generic paint programs or (for drawings) some widely available
drawing editor, and that is suitable for input to text formatters or
for automatic translation to a variety of formats suitable for input
to text formatters. A copy made in an otherwise Transparent file
format whose markup has been designed to thwart or discourage
subsequent modification by readers is not Transparent. A copy that is
not "Transparent" is called "Opaque."
format whose markup, or absence of markup, has been arranged to thwart
or discourage subsequent modification by readers is not Transparent.
An image format is not Transparent if used for any substantial amount
of text. A copy that is not "Transparent" is called "Opaque".
Examples of suitable formats for Transparent copies include plain
ASCII without markup, Texinfo input format, LaTeX input format, SGML
or XML using a publicly available DTD, and standard-conforming simple
HTML designed for human modification. Opaque formats include
PostScript, PDF, proprietary formats that can be read and edited only
by proprietary word processors, SGML or XML for which the DTD and/or
HTML, PostScript or PDF designed for human modification. Examples of
transparent image formats include PNG, XCF and JPG. Opaque formats
include proprietary formats that can be read and edited only by
proprietary word processors, SGML or XML for which the DTD and/or
processing tools are not generally available, and the
machine-generated HTML produced by some word processors for output
purposes only.
machine-generated HTML, PostScript or PDF produced by some word
processors for output purposes only.
The "Title Page" means, for a printed book, the title page itself,
plus such following pages as are needed to hold, legibly, the material
@ -103,6 +113,21 @@ formats which do not have any title page as such, "Title Page" means
the text near the most prominent appearance of the work's title,
preceding the beginning of the body of the text.
A section "Entitled XYZ" means a named subunit of the Document whose
title either is precisely XYZ or contains XYZ in parentheses following
text that translates XYZ in another language. (Here XYZ stands for a
specific section name mentioned below, such as "Acknowledgements",
"Dedications", "Endorsements", or "History".) To "Preserve the Title"
of such a section when you modify the Document means that it remains a
section "Entitled XYZ" according to this definition.
The Document may include Warranty Disclaimers next to the notice which
states that this License applies to the Document. These Warranty
Disclaimers are considered to be included by reference in this
License, but only as regards disclaiming warranties: any other
implication that these Warranty Disclaimers may have is void and has
no effect on the meaning of this License.
.SH 2. VERBATIM COPYING
You may copy and distribute the Document in any medium, either
@ -120,9 +145,10 @@ you may publicly display copies.
.SH 3. COPYING IN QUANTITY
If you publish printed copies of the Document numbering more than 100,
and the Document's license notice requires Cover Texts, you must enclose
the copies in covers that carry, clearly and legibly, all these Cover
If you publish printed copies (or copies in media that commonly have
printed covers) of the Document, numbering more than 100, and the
Document's license notice requires Cover Texts, you must enclose the
copies in covers that carry, clearly and legibly, all these Cover
Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
the back cover. Both covers must also clearly and legibly identify
you as the publisher of these copies. The front cover must present
@ -140,16 +166,15 @@ pages.
If you publish or distribute Opaque copies of the Document numbering
more than 100, you must either include a machine-readable Transparent
copy along with each Opaque copy, or state in or with each Opaque copy
a publicly-accessible computer-network location containing a complete
Transparent copy of the Document, free of added material, which the
general network-using public has access to download anonymously at no
charge using public-standard network protocols. If you use the latter
option, you must take reasonably prudent steps, when you begin
distribution of Opaque copies in quantity, to ensure that this
Transparent copy will remain thus accessible at the stated location
until at least one year after the last time you distribute an Opaque
copy (directly or through your agents or retailers) of that edition to
the public.
a computer-network location from which the general network-using
public has access to download using public-standard network protocols
a complete Transparent copy of the Document, free of added material.
If you use the latter option, you must take reasonably prudent steps,
when you begin distribution of Opaque copies in quantity, to ensure
that this Transparent copy will remain thus accessible at the stated
location until at least one year after the last time you distribute an
Opaque copy (directly or through your agents or retailers) of that
edition to the public.
It is requested, but not required, that you contact the authors of the
Document well before redistributing any large number of copies, to give
@ -165,17 +190,18 @@ and modification of the Modified Version to whoever possesses a copy
of it. In addition, you must do these things in the Modified Version:
.TP
A.
Use in the Title Page (and on the covers, if any) a title distinct
from that of the Document, and from those of previous versions
(which should, if there were any, be listed in the History section
of the Document). You may use the same title as a previous version
if the original publisher of that version gives permission.
Use in the Title Page (and on the covers, if any) a title distinct from
that of the Document, and from those of previous versions (which should,
if there were any, be listed in the History section of the Document).
You may use the same title as a previous version if the original
publisher of that version gives permission.
.TP
B.
List on the Title Page, as authors, one or more persons or entities
responsible for authorship of the modifications in the Modified
Version, together with at least five of the principal authors of the
Document (all of its principal authors, if it has less than five).
responsible for authorship of the modifications in the Modified Version,
together with at least five of the principal authors of the Document
(all of its principal authors, if it has fewer than five), unless they
release you from this requirement.
.TP
C.
State on the Title page the name of the publisher of the
@ -190,8 +216,8 @@ adjacent to the other copyright notices.
.TP
F.
Include, immediately after the copyright notices, a license notice
giving the public permission to use the Modified Version under the
terms of this License, in the form shown in the Addendum below.
giving the public permission to use the Modified Version under the terms
of this License, in the form shown in the Addendum below.
.TP
G.
Preserve in that license notice the full lists of Invariant Sections
@ -201,41 +227,44 @@ H.
Include an unaltered copy of this License.
.TP
I.
Preserve the section entitled "History", and its title, and add to
it an item stating at least the title, year, new authors, and
publisher of the Modified Version as given on the Title Page. If
there is no section entitled "History" in the Document, create one
stating the title, year, authors, and publisher of the Document as
given on its Title Page, then add an item describing the Modified
Version as stated in the previous sentence.
Preserve the section Entitled "History", Preserve its Title, and add to
it an item stating at least the title, year, new authors, and publisher
of the Modified Version as given on the Title Page. If there is no
section Entitled "History" in the Document, create one stating the
title, year, authors, and publisher of the Document as given on its
Title Page, then add an item describing the Modified Version as stated
in the previous sentence.
.TP
J.
Preserve the network location, if any, given in the Document for
public access to a Transparent copy of the Document, and likewise
the network locations given in the Document for previous versions
it was based on. These may be placed in the "History" section.
You may omit a network location for a work that was published at
least four years before the Document itself, or if the original
publisher of the version it refers to gives permission.
Preserve the network location, if any, given in the Document for public
access to a Transparent copy of the Document, and likewise the network
locations given in the Document for previous versions it was based on.
These may be placed in the "History" section. You may omit a network
location for a work that was published at least four years before the
Document itself, or if the original publisher of the version it refers
to gives permission.
.TP
K.
In any section entitled "Acknowledgements" or "Dedications",
preserve the section's title, and preserve in the section all the
substance and tone of each of the contributor acknowledgements
and/or dedications given therein.
For any section Entitled "Acknowledgements" or "Dedications", Preserve
the Title of the section, and preserve in the section all the substance
and tone of each of the contributor acknowledgements and/or dedications
given therein.
.TP
L.
Preserve all the Invariant Sections of the Document,
unaltered in their text and in their titles. Section numbers
or the equivalent are not considered part of the section titles.
Preserve all the Invariant Sections of the Document, unaltered in their
text and in their titles. Section numbers or the equivalent are not
considered part of the section titles.
.TP
M.
Delete any section entitled "Endorsements." Such a section
may not be included in the Modified Version.
Delete any section Entitled "Endorsements". Such a section may not be
included in the Modified Version.
.TP
N.
Do not retitle any existing section as "Endorsements"
or to conflict in title with any Invariant Section.
Do not retitle any existing section to be Entitled "Endorsements" or to
conflict in title with any Invariant Section.
.TP
O.
Preserve any Warranty Disclaimers.
.PP
If the Modified Version includes new front-matter sections or
appendices that qualify as Secondary Sections and contain no material
@ -244,7 +273,7 @@ of these sections as invariant. To do this, add their titles to the
list of Invariant Sections in the Modified Version's license notice.
These titles must be distinct from any other section titles.
You may add a section entitled "Endorsements", provided it contains
You may add a section Entitled "Endorsements", provided it contains
nothing but endorsements of your Modified Version by various
parties--for example, statements of peer review or that the text has
been approved by an organization as the authoritative definition of a
@ -271,7 +300,7 @@ License, under the terms defined in section 4 above for modified
versions, provided that you include in the combination all of the
Invariant Sections of all of the original documents, unmodified, and
list them all as Invariant Sections of your combined work in its
license notice.
license notice, and that you preserve all their Warranty Disclaimers.
The combined work need only contain one copy of this License, and
multiple identical Invariant Sections may be replaced with a single
@ -282,11 +311,11 @@ author or publisher of that section if known, or else a unique number.
Make the same adjustment to the section titles in the list of
Invariant Sections in the license notice of the combined work.
In the combination, you must combine any sections entitled "History"
in the various original documents, forming one section entitled
"History"; likewise combine any sections entitled "Acknowledgements",
and any sections entitled "Dedications." You must delete all sections
entitled "Endorsements."
In the combination, you must combine any sections Entitled "History"
in the various original documents, forming one section Entitled
"History"; likewise combine any sections Entitled "Acknowledgements",
and any sections Entitled "Dedications". You must delete all sections
Entitled "Endorsements".
.SH 6. COLLECTIONS OF DOCUMENTS
@ -305,18 +334,20 @@ other respects regarding verbatim copying of that document.
A compilation of the Document or its derivatives with other separate
and independent documents or works, in or on a volume of a storage or
distribution medium, does not as a whole count as a Modified Version
of the Document, provided no compilation copyright is claimed for the
compilation. Such a compilation is called an "aggregate", and this
License does not apply to the other self-contained works thus compiled
with the Document, on account of their being thus compiled, if they
are not themselves derivative works of the Document.
distribution medium, is called an "aggregate" if the copyright
resulting from the compilation is not used to limit the legal rights
of the compilation's users beyond what the individual works permit.
When the Document is included in an aggregate, this License does not
apply to the other works in the aggregate which are not themselves
derivative works of the Document.
If the Cover Text requirement of section 3 is applicable to these
copies of the Document, then if the Document is less than one quarter
of the entire aggregate, the Document's Cover Texts may be placed on
covers that surround only the Document within the aggregate.
Otherwise they must appear on covers around the whole aggregate.
copies of the Document, then if the Document is less than one half of
the entire aggregate, the Document's Cover Texts may be placed on
covers that bracket the Document within the aggregate, or the
electronic equivalent of covers if the Document is in electronic form.
Otherwise they must appear on printed covers that bracket the whole
aggregate.
.SH 8. TRANSLATION
@ -326,10 +357,17 @@ Replacing Invariant Sections with translations requires special
permission from their copyright holders, but you may include
translations of some or all Invariant Sections in addition to the
original versions of these Invariant Sections. You may include a
translation of this License provided that you also include the
original English version of this License. In case of a disagreement
between the translation and the original English version of this
License, the original English version will prevail.
translation of this License, and all the license notices in the
Document, and any Warranty Disclaimers, provided that you also include
the original English version of this License and the original versions
of those notices and disclaimers. In case of a disagreement between
the translation and the original version of this License or a notice
or disclaimer, the original version will prevail.
If a section in the Document is Entitled "Acknowledgements",
"Dedications", or "History", the requirement (section 4) to Preserve
its Title (section 1) will typically require changing the actual
title.
.SH 9. TERMINATION
@ -358,7 +396,6 @@ Free Software Foundation. If the Document does not specify a version
number of this License, you may choose any version ever published (not
as a draft) by the Free Software Foundation.
.SH ADDENDUM: How to use this License for your documents
To use this License in a document you have written, include a copy of
@ -372,20 +409,28 @@ Copyright
.if n (c)
[\fIyear\fP] [\fIyour name\fP].
Permission is granted to copy, distribute and/or modify this document
under the terms of the GNU Free Documentation License, Version 1.1
under the terms of the GNU Free Documentation License, Version 1.2
or any later version published by the Free Software Foundation;
with the Invariant Sections being [\fIlist their titles\fP], with the
Front-Cover Texts being [\fIlist\fP], and with the Back-Cover Texts
being [\fIlist\fP].
with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
A copy of the license is included in the section entitled "GNU
Free Documentation License."
.ad
.hy 1
If you have no Invariant Sections, write "with no Invariant Sections"
instead of saying which ones are invariant. If you have no
Front-Cover Texts, write "no Front-Cover Texts" instead of
"Front-Cover Texts being [\fIlist\fP]"; likewise for Back-Cover Texts.
If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
replace the "with...Texts." line with this:
.hy 0
.na
with the Invariant Sections being [\fILIST THEIR TITLES\fP], with the
Front-Cover Texts being [\fILIST\fP], and with the Back-Cover Texts being
[\fILIST\fP].
.ad
.hy 1
If you have Invariant Sections without Cover Texts, or some other
combination of the three, merge those two alternatives to suit the
situation.
If your document contains nontrivial examples of program code, we
recommend releasing these examples in parallel under your choice of

5
etc/images/README Normal file
View File

@ -0,0 +1,5 @@
The following icons are from GNOME 2.10:
refresh.pbm, refresh.xpm
They are not part of Emacs, but distributed and used by Emacs.

View File

@ -0,0 +1,20 @@
/* XPM */
static char * sb_obj_xpm[] = {
"15 15 2 1",
" c None",
". c #000CFF",
" .. . .. . ",
". . . . . . ",
". . . . . . ",
". . . . . . ",
" .. . .. . ",
" ",
". .. . .. ",
". . . . . . ",
". . . . . . ",
". . . . . . ",
". .. . .. ",
" ",
" .. . .. . ",
". . . . . . ",
". . . . . . "};

View File

@ -0,0 +1,21 @@
/* XPM */
static char * sb_objod_xpm[] = {
"15 15 3 1",
" c None",
". c #000CFF",
"+ c #FFFA00",
" .. . .. . ",
". .++ . . . ",
". .++ . . . ",
". . ++. . . ",
" .. ++ .. . ",
" ++ ",
". ..++. .. ",
". . .++ . . ",
". . .++ . . ",
". . .++ . . ",
". .. . .. ",
" ++ ",
" .. . ++. . ",
". . . . . . ",
". . . . . . "};

View File

@ -0,0 +1,22 @@
/* XPM */
static char * sb_box_minus_xpm[] = {
"20 15 4 1",
" c None",
". c #000000",
"+ c #828282",
"@ c #D19200",
"...+ +..+ ",
".@@.+ +.@.+",
"+.@@.+ +.@@@.",
"+.@@@.+++++++++.@@..",
" +..@............@.+",
" +.@..@@@@@@@@@@@..+",
" +.@@..............+",
" +.@@.@@@@@@@@@@@@.+",
" +.@@.@@@@@@@@@@@@.+",
" +.@@.@@@......@@@.+",
" +.@@.@@@......@@@.+",
" +.@.@@@@@@@@@@@@.+",
" +..@@@@@@@@@@@@.+",
" +..............+",
" ++++++++++++++ "};

View File

@ -0,0 +1,22 @@
/* XPM */
static char * sb_box_plus_xpm[] = {
"20 15 4 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #D19200",
" ",
" .............. ",
" .++++++++++++++. ",
" .++@@@@@@+@@@@@+. ",
" .+@+@@@@@@+@@@@@+. ",
" .+@@++++++++++++++.",
" .+@@+@@@@@@@@@@@@+.",
" .+@@+@@@@@++@@@@@+.",
" .+@@+@@@@@++@@@@@+.",
" .+@@+@@@++++++@@@+.",
" .+@@+@@@++++++@@@+.",
" .+@+@@@@@++@@@@@+.",
" .++@@@@@++@@@@@+.",
" .++++++++++++++.",
" .............. "};

View File

@ -0,0 +1,22 @@
/* XPM */
static char * sb_box_xpm[] = {
"20 15 4 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFF993",
" ",
" ............... ",
" .++++++++++++++. ",
" .++@@@@@@+@@@@@+. ",
" .+@+@@@@@@+@@@@@+. ",
" .+@@++++++++++++++.",
" .+@@+@@@@@@@@@@@@+.",
" .+@@+@@@@@@@@@@@@+.",
" .+@@+@@@@@@@@@@@@+.",
" .+@@+@@@@@@@@@@@@+.",
" .+@@+@@@@@@@@@@@@+.",
" .+@+@@@@@@@@@@@@+.",
". .++@@@@@@@@@@@@+.",
" .++++++++++++++.",
" .............. "};

View File

@ -0,0 +1,20 @@
/* XPM */
static char * sb_chk_xpm[] = {
"15 15 2 1",
" c None",
". c #FF0000",
" ",
" . . .. ",
" . . . ",
" . . . . ",
" . .. . ",
" .. ",
" .. ",
" ... .. ",
" ... .. ",
" .... .. ",
" ... .. ",
" .... ",
" ... ",
" . ",
" "};

View File

@ -0,0 +1,23 @@
/* XPM */
static char * sb_dir_minus_xpm[] = {
"20 15 5 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #DBDB00",
"# c #FFF993",
" ....... ",
".+++++++. ",
".+@@@@@@+......... ",
".+@@@@@@@++++++++. ",
".+@@@@@@@@@@@@@@+...",
".+@@++++++++++++++++",
".+@@+##############+",
".+@+##############+.",
".+@+####++++++####+.",
".+@+####++++++####+.",
".+@+##############+.",
".++##############+..",
".++##############+. ",
".+++++++++++++++++. ",
" ................. "};

View File

@ -0,0 +1,23 @@
/* XPM */
static char * sb_dir_plus_xpm[] = {
"20 15 5 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #DBDB00",
"# c #FFF993",
" ....... ",
".+++++++. ",
".+@@@@@@+.......... ",
".+@@@@@@@++++++++++.",
".+@@@@@@@@@@@@@@@@+.",
".+#######++#####@@+.",
".+#######++######@+.",
".+#####++++++####@+.",
".+#####++++++####@+.",
".+#######++######@+.",
".+#######++######@+.",
".+###############@+.",
".+###############@+.",
".++++++++++++++++++.",
" .................. "};

View File

@ -0,0 +1,23 @@
/* XPM */
static char * sb_dir_xpm[] = {
"20 15 5 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #DBDB00",
"# c #FFF993",
" ....... ",
".+++++++. ",
".+@@@@@@+.......... ",
".+@@@@@@@++++++++++.",
".+@@@@@@@@@@@@@@@@+.",
".+##############@@+.",
".+###############@+.",
".+###############@+.",
".+###############@+.",
".+###############@+.",
".+###############@+.",
".+###############@+.",
".+###############@+.",
".++++++++++++++++++.",
" .................. "};

View File

@ -0,0 +1,23 @@
/* XPM */
static char * sb_doc_minus_xpm[] = {
"15 15 5 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #5A818B",
"# c #FFFFFF",
" ....... ",
" .+++++++. ",
" .+@@@@@@+. ",
" .+@@@@@@+#. ",
" .+@@@@@@+#+.",
" .+@####@+##+.",
" .+@@@@@@@+#+. ",
" .+@@@@@@+##+. ",
".++++@@@@+#+. ",
".+###++++##+. ",
".+########+. ",
".++#######+. ",
" ..++++##+. ",
" ....+++. ",
" ... "};

View File

@ -0,0 +1,23 @@
/* XPM */
static char * sb_doc_plus_xpm[] = {
"15 15 5 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #5A818B",
"# c #FFFFFF",
" ....... ",
" .+++++++. ",
" .+@@@@@@+. ",
" .+@@#@@@+#. ",
" .+@@#@@@+#+.",
" .+@#####+##+.",
" .+@@@@#@@+#+. ",
" .+@@@@#@+##+. ",
".++++@@@@+#+. ",
".+###++++##+. ",
".+########+. ",
".++#######+. ",
" ..++++##+. ",
" ....+++. ",
" ... "};

View File

@ -0,0 +1,23 @@
/* XPM */
static char * sb_doc_xpm[] = {
"15 15 5 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #5A818B",
"# c #FFFFFF",
" ....... ",
" .+++++++. ",
" .+@@@@@@+. ",
" .+@@@@@@+#. ",
" .+@@@@@@+#+.",
" .+@@@@@@+##+.",
" .+@@@@@@@+#+. ",
" .+@@@@@@+##+. ",
".++++@@@@+#+. ",
".+###++++##+. ",
".+########+. ",
".+########+. ",
".++++++##+. ",
" ......+++. ",
" ... "};

View File

@ -0,0 +1,22 @@
/* XPM */
static char * sb_info_xpm[] = {
"10 15 4 1",
" c None",
". c #BEBEBE",
"+ c #0000FF",
"@ c #FFFFFF",
" .. ",
" ..+++. ",
" .+++@++. ",
" .+++++++ ",
" .+++++++ ",
".++@@@++++",
".++++@++++",
".++++@++++",
".++++@++++",
" .+++@++++",
" .+++@+++ ",
" .+@@@@@+ ",
" .+++++++ ",
" .+++++ ",
" ++ "};

View File

@ -0,0 +1,23 @@
/* XPM */
static char * key_xpm[] = {
"16 16 4 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFF993",
" ........ ",
" ..++++++.. ",
" .+@@@@@@+. ",
" .+@@++@@+. ",
" .+@@@@@@+. ",
" .+@@@@@@+. ",
" .+@@@@@@+. ",
" .+@@@@+. ",
" .+@@+. ",
" .+@@@+. ",
" .+@@+. ",
" .+@@+. ",
" .+@@@+. ",
" .+@@+. ",
" .++. ",
" .. "};

View File

@ -0,0 +1,22 @@
/* XPM */
static char * sb_label_xpm[] = {
"10 16 3 1",
" c None",
". c gray",
"+ c blue",
" .....",
" ..+++++",
" .+++++++",
" .++++++++",
" .++++++++",
".+++++++++",
".+++++++++",
".+++++++++",
".+++++++++",
".+++++++++",
".+++++++++",
".+++++++++",
".+++++++++",
".+++++++++",
".+++++++++",
".+++++++++"};

View File

@ -0,0 +1,23 @@
/* XPM */
static char * lock_xpm[] = {
"16 16 4 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFF993",
" ........ ",
" ..++++++.. ",
" .++....++. ",
" .+......+. ",
" ..+......+.. ",
" ..++++++++++..",
" .++@@@@@@@@++.",
" .+@@@@@@@@@@+.",
" .+@@@@@@@@@@+.",
" .+@@@++++@@@+.",
" .+@@@@++@@@@+.",
" .+@@@@@@@@@@+.",
" .+@@@@++@@@@+.",
" .+@@@@@@@@@@+.",
" .++++++++++++.",
" .............."};

View File

@ -0,0 +1,22 @@
/* XPM */
static char * sb_mail_xpm[] = {
"20 15 4 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFFFFF",
"................... ",
".++++++++++++++++++.",
".++@@@@@@@@@@@@@@++.",
".+@++@@@@@@@@@@++@+.",
".+@@@++@@@@@@++@@@+.",
".+@@@@@++@@++@@@@@+.",
".+@@@@@@@++@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@@@@+@@@@@@+@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@@+@@@@@@@@@@+@@+.",
".+@@@@@@@@@@@@@@@@+.",
".++@@@@@@@@@@@@@@++.",
".++++++++++++++++++.",
" .................. "};

View File

@ -0,0 +1,23 @@
/* XPM */
static char * sb_pg_minus_xpm[] = {
"20 15 5 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFFFFF",
"# c #ADADAD",
" ............ ",
" .++++++++++++.",
" .++@@@@@@@@@@+.",
" .+#+@@@@@@@@@@+.",
" .+##+@@@@@@@@@@+.",
" .+###+@@@@@@@@@@+.",
" .+####+@@@@@@@@@@+.",
".+++++++@++++++@@@+.",
".+@@@@@@@++++++@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".++++++++++++++++++.",
" .................. "};

View File

@ -0,0 +1,23 @@
/* XPM */
static char * sb_pg_plus_xpm[] = {
"20 15 5 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFFFFF",
"# c #ADADAD",
" ............ ",
" .++++++++++++.",
" .++@@@@@@@@@@+.",
" .+#+@@@@@@@@@@+.",
" .+##+@@@@@@@@@@+.",
" .+###+@@@++@@@@@+.",
" .+####+@@@++@@@@@+.",
".+++++++@++++++@@@+.",
".+@@@@@@@++++++@@@+.",
".+@@@@@@@@@++@@@@@+.",
".+@@@@@@@@@++@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".++++++++++++++++++.",
" .................. "};

View File

@ -0,0 +1,23 @@
/* XPM */
static char * sb_pg_xpm[] = {
"20 15 5 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFFFFF",
"# c #ADADAD",
" ............ ",
" .++++++++++++.",
" .++@@@@@@@@@@+.",
" .+#+@@@@@@@@@@+.",
" .+##+@@@@@@@@@@+.",
" .+###+@@@@@@@@@@+.",
" .+####+@@@@@@@@@@+.",
".+++++++@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".++++++++++++++++++.",
" .................. "};

View File

@ -0,0 +1,22 @@
/* XPM */
static char * sb_tag_gt_xpm[] = {
"20 15 4 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFF993",
" ",
" ",
" ............... ",
" .+++++++++++++++.",
" .+@@@@@++@@@@@@@+.",
" .+@@@@@@+++@@@@@@+.",
".+@@@@@@@++++@@@@@+.",
".+@++@@@@+++++@@@@+.",
".+@++@@@@+++++.@@@+.",
".+@@@@@@@++++.@@@@+.",
" .+@@@@@@+++.@@@@@+.",
" .+@@@@@++.@@@@@@+.",
". .++++++.++++++++.",
" ............... ",
" "};

View File

@ -0,0 +1,22 @@
/* XPM */
static char * sb_tag__xpm[] = {
"20 15 4 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFF993",
" ",
" ",
" ............... ",
" .+++++++++++++++.",
" .+@@@@@@@@@@@@@@+.",
" .+@@@@@@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@++@@++++++@@@@@+.",
".+@++@@++++++@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
" .+@@@@@@@@@@@@@@@+.",
" .+@@@@@@@@@@@@@@+.",
". .+++++++++++++++.",
" ............... ",
" "};

View File

@ -0,0 +1,22 @@
/* XPM */
static char * sb_tag+_xpm[] = {
"20 15 4 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFF993",
" ",
" ",
" ............... ",
" .+++++++++++++++.",
" .+@@@@@@@@@@@@@@+.",
" .+@@@@@@++@@@@@@@+.",
".+@@@@@@@++@@@@@@@+.",
".+@++@@++++++@@@@@+.",
".+@++@@++++++@@@@@+.",
".+@@@@@@@++@@@@@@@+.",
" .+@@@@@@++@@@@@@@+.",
" .+@@@@@@@@@@@@@@+.",
". .+++++++++++++++.",
" ............... ",
" "};

View File

@ -0,0 +1,22 @@
/* XPM */
static char * sb_tag_type_xpm[] = {
"20 15 4 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFF993",
" ",
" ",
" ............... ",
" .+++++++++++++++.",
" .+@@@@@@@@@@@@@@+.",
" .+@@@@@@++++++@@@+.",
".+@@@@@@@++++++@@@+.",
".+@++@@@@@@++@@@@@+.",
".+@++@@@@@@++@@@@@+.",
".+@@@@@@@@@++@@@@@+.",
" .+@@@@@@@@++@@@@@+.",
" .+@@@@@@@@@@@@@@+.",
". .+++++++++++++++.",
" ............... ",
" "};

View File

@ -0,0 +1,22 @@
/* XPM */
static char * sb_tag_v_xpm[] = {
"20 15 4 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFF993",
" ",
" ",
" ............... ",
" .+++++++++++++++.",
" .+@@@@@@@@@@@@@@+.",
" .+@@@++++++++++.@+.",
".+@@@@@++++++++.@@+.",
".+@++@@@++++++.@@@+.",
".+@++@@@@++++.@@@@+.",
".+@@@@@@@@++.@@@@@+.",
" .+@@@@@@@@.@@@@@@+.",
" .+@@@@@@@@@@@@@@+.",
". .+++++++++++++++.",
" ............... ",
" "};

View File

@ -0,0 +1,22 @@
/* XPM */
static char * sb_tag_xpm[] = {
"20 15 4 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFF993",
" ",
" ",
" ............... ",
" .+++++++++++++++.",
" .+@@@@@@@@@@@@@@+.",
" .+@@@@@@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
".+@++@@@@@@@@@@@@@+.",
".+@++@@@@@@@@@@@@@+.",
".+@@@@@@@@@@@@@@@@+.",
" .+@@@@@@@@@@@@@@@+.",
" .+@@@@@@@@@@@@@@+.",
". .+++++++++++++++.",
" ............... ",
" "};

View File

@ -0,0 +1,23 @@
/* XPM */
static char * unlock_xpm[] = {
"16 16 4 1",
" c None",
". c #828282",
"+ c #000000",
"@ c #FFF993",
" ....... ",
"..+++++.. ",
".++...++. ",
".+.....+. ",
".+.....+........",
"....++++++++++..",
" .++@@@@@@@@++.",
" .+@@@@@@@@@@+.",
" .+@@@@@@@@@@+.",
" .+@@@++++@@@+.",
" .+@@@@++@@@@+.",
" .+@@@@@@@@@@+.",
" .+@@@@++@@@@+.",
" .+@@@@@@@@@@+.",
" .++++++++++++.",
" .............."};

BIN
etc/images/refresh.pbm Normal file

Binary file not shown.

113
etc/images/refresh.xpm Normal file
View File

@ -0,0 +1,113 @@
/* XPM */
static char * refresh_xpm[] = {
"24 24 86 1",
" c None",
". c #000000",
"+ c #F3F6F8",
"@ c #C8D4DF",
"# c #F7F9FA",
"$ c #0D110C",
"% c #6286A5",
"& c #A0B6C9",
"* c #C9D5E0",
"= c #F2F5F7",
"- c #172116",
"; c #819EB6",
"> c #CAD6E1",
", c #CCD7E1",
"' c #CED9E3",
") c #F6F8F9",
"! c #7192AE",
"~ c #587B99",
"{ c #CDD8E2",
"] c #CFDAE4",
"^ c #D3DDE6",
"/ c #D5DEE6",
"( c #ADC0D0",
"_ c #90A9BF",
": c #537490",
"< c #23323E",
"[ c #85A1B8",
"} c #5E83A3",
"| c #6084A3",
"1 c #6689A7",
"2 c #678AA8",
"3 c #48657D",
"4 c #A8BCCD",
"5 c #7393AE",
"6 c #6B8DAA",
"7 c #5C81A1",
"8 c #5D82A2",
"9 c #6588A6",
"0 c #435F76",
"a c #B1C3D2",
"b c #50718D",
"c c #9FB5C8",
"d c #94ACC1",
"e c #425D73",
"f c #435E74",
"g c #B4C5D3",
"h c #6C8EAB",
"i c #C4D2DD",
"j c #5B80A0",
"k c #456178",
"l c #7595B0",
"m c #BFCEDA",
"n c #597D9C",
"o c #A3B8CA",
"p c #B0C2D1",
"q c #86A2B9",
"r c #6E8FAB",
"s c #E1E8EE",
"t c #B9C9D6",
"u c #6387A6",
"v c #4C6B85",
"w c #7F9DB6",
"x c #BCCCD9",
"y c #DDE5EC",
"z c #E4EAEF",
"A c #D8E1E9",
"B c #D1DBE4",
"C c #C7D3DE",
"D c #B7C8D6",
"E c #7091AD",
"F c #537592",
"G c #9DB3C6",
"H c #8CA7BD",
"I c #304353",
"J c #4E6E89",
"K c #829FB7",
"L c #92ABC0",
"M c #C5D3DE",
"N c #7C9AB3",
"O c #5A7E9D",
"P c #47647C",
"Q c #6185A4",
"R c #5B7F9E",
"S c #4F6F8A",
"T c #405A71",
"U c #283926",
" . ",
" .. ",
" .+. ",
" ....@#. ",
" $%&@@**=. .. ",
" -;@@**>,'). .!~. ",
" .%@**>,{]^/(. ._:. ",
" <&@[}}|%123. .4. ",
".5@678|%920. .ab. ",
".cd7e...1f. . .gh. ",
".ijb. .k. .. .al. ",
".mn. .. .'. .op5. ",
".qr. . .*s...at4u. ",
".vw. .xyzyABCDEF. ",
" .G. .p'B,@ixaH2I. ",
" .JK. .LM@,>>MmNOP. ",
" .F9. .9|%Q|}7RS.. ",
" .. .|R~~nJT.. ",
" .j~.... ",
" UO. ",
" .. ",
" . ",
" ",
" "};

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
% Reference Card for Org Mode 3.15
% Reference Card for Org Mode 3.16
%
%**start of header
\newcount\columnsperpage
@ -58,7 +58,7 @@
% Thanks to Paul Rubin, Bob Chassell, Len Tower, and Richard Mlynarik
% for their many good ideas.
\def\orgversionnumber{3.15}
\def\orgversionnumber{3.16}
\def\year{2005}
\def\shortcopyrightnotice{\vskip 1ex plus 2 fill
@ -315,9 +315,9 @@ \section{Structure Editing}
\key{move subtree up}{M-S-UP}
\key{move subtree down}{M-S-DOWN}
\key{kill subtree}{C-c C-h C-w}
\key{copy subtree}{C-c C-h M-w}
\key{yank subtree}{C-c C-h C-y}
\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{archive subtree}{C-c \$}
To set archive location for current file, add a line like$^3$:
@ -362,20 +362,18 @@ \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 $-1$ day}{S-LEFT$^4$}
\key{change timestamp at cursor by $+1$ day}{S-RIGHT$^4$}
\key{change year/month/day at cursor by $-1$}{S-DOWN$^4$}
\key{change year/month/day at cursor by $+1$}{S-UP$^4$}
\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{While prompted for a date:}{}
\key{... select date in calendar}{mouse-1/RET}
\key{... scroll calendar back/forward one month}{< / >}
@ -457,9 +455,9 @@ \section{Tables}
{\bf Regions}
\key{cut rectangular region}{C-c C-h C-w}
\key{copy rectangular region}{C-c C-h M-w}
\key{paste rectangular region}{C-c C-h C-y}
\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}
@ -589,7 +587,7 @@ \section{Exporting}
\key{export as ASCII file}{C-c C-x a}
\key{export visible text only (e.g. for printing)}{C-c C-x v}
\key{export as HTML file}{C-c C-x h}
\key{export as HTML and open in browser}{C-c C-x C-h}
\key{export as HTML and open in browser}{C-c C-x b}
\key{prefix arg sets nb. of headline levels, e.g.}{C-3 C-c C-x h}
\key{insert template of export options}{C-c C-x t}
@ -730,9 +728,6 @@ \section{Notes}
\bye
% Local variables:
% compile-command: "tex ord-mode-ref"
% TeX-master: t
% End:
% arch-tag: 139f6750-5cfc-49ca-92b5-237fe5795290

View File

@ -48,6 +48,7 @@ Emacs
* Message: (message). Mail and news composition mode that goes with Gnus.
* MH-E: (mh-e). Emacs interface to the MH mail system.
* MIME: (emacs-mime). Emacs MIME de/composition library.
* Newsticker: (newsticker). A News ticker for Emacs.
* PGG: (pgg). Emacs interface to various PGP implementations.
* SC: (sc). Supercite lets you cite parts of messages you're
replying to, in flexible ways.

1
leim/.gitignore vendored
View File

@ -1,4 +1,5 @@
Makefile
makefile
changed.misc
changed.tit
leim-list.el

1
lib-src/.gitignore vendored
View File

@ -20,5 +20,6 @@ test-distrib
update-game-score
yow
Makefile
makefile
*-spd
*.pdb

View File

@ -1,3 +1,22 @@
2005-09-27 Francesco Potort,Al(B <pot@gnu.org>
* etags.c: Preliminary Forth support.
(prolog_pr): Cast strlen to int before comparison.
(LOOKING_AT, LOOKING_AT_NOCASE): Let the preprocessor check that
the second argument is indeed a literal string.
(main): In append mode, sort the tags file after writing it.
2005-09-27 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
* etags.c (longopts, print_help, main): The -a (--append) option
can be used in ctags also; for one, the Linux make file uses it.
2005-09-20 Chong Yidong <cyd@stupidchicken.com>
* ebrowse.c (add_sym): Compare namespace names instead of
namespace objects. This prevents the parser from incorrectly
treating classes whose superclass is in another namespace.
2005-09-15 Richard M. Stallman <rms@gnu.org>
* Makefile.in (update-game-score.o): New target.

View File

@ -648,7 +648,10 @@ add_sym (name, nested_in_class)
h %= TABLE_SIZE;
for (sym = class_table[h]; sym; sym = sym->next)
if (streq (name, sym->name) && sym->namesp == scope)
if (streq (name, sym->name)
&& ((!sym->namesp && !scope)
|| (sym->namesp && scope
&& streq (sym->namesp->name, scope->name))))
break;
if (sym == NULL)

View File

@ -41,7 +41,7 @@
* configuration file containing regexp definitions for etags.
*/
char pot_etags_version[] = "@(#) pot revision number is 17.5";
char pot_etags_version[] = "@(#) pot revision number is 17.14";
#define TRUE 1
#define FALSE 0
@ -343,6 +343,7 @@ static void Cobol_paragraphs __P((FILE *));
static void Cplusplus_entries __P((FILE *));
static void Cstar_entries __P((FILE *));
static void Erlang_functions __P((FILE *));
static void Forth_words __P((FILE *));
static void Fortran_functions __P((FILE *));
static void HTML_labels __P((FILE *));
static void Lisp_functions __P((FILE *));
@ -489,6 +490,7 @@ static bool need_filebuf; /* some regexes are multi-line */
#if LONG_OPTIONS
static struct option longopts[] =
{
{ "append", no_argument, NULL, 'a' },
{ "packages-only", no_argument, &packages_only, TRUE },
{ "c++", no_argument, NULL, 'C' },
{ "declarations", no_argument, &declarations, TRUE },
@ -508,7 +510,7 @@ static struct option longopts[] =
{ "parse-stdin", required_argument, NULL, STDIN },
{ "version", no_argument, NULL, 'V' },
#if CTAGS /* Etags options */
#if CTAGS /* Ctags options */
{ "backward-search", no_argument, NULL, 'B' },
{ "cxref", no_argument, NULL, 'x' },
{ "defines", no_argument, NULL, 'd' },
@ -519,8 +521,7 @@ static struct option longopts[] =
{ "vgrind", no_argument, NULL, 'v' },
{ "no-warn", no_argument, NULL, 'w' },
#else /* Ctags options */
{ "append", no_argument, NULL, 'a' },
#else /* Etags options */
{ "no-defines", no_argument, NULL, 'D' },
{ "no-globals", no_argument, &globals, FALSE },
{ "include", required_argument, NULL, 'i' },
@ -631,6 +632,12 @@ static char Erlang_help [] =
"In Erlang code, the tags are the functions, records and macros\n\
defined in the file.";
char *Forth_suffixes [] =
{ "fth", "tok", NULL };
static char Forth_help [] =
"In Forth code, tags are words defined by `:',\n\
constant, code, create, defer, value, variable, buffer:, field.";
static char *Fortran_suffixes [] =
{ "F", "f", "f90", "for", NULL };
static char Fortran_help [] =
@ -778,6 +785,7 @@ static language lang_names [] =
{ "c*", no_lang_help, Cstar_entries, Cstar_suffixes },
{ "cobol", Cobol_help, Cobol_paragraphs, Cobol_suffixes },
{ "erlang", Erlang_help, Erlang_functions, Erlang_suffixes },
{ "forth", Forth_help, Forth_words, Forth_suffixes },
{ "fortran", Fortran_help, Fortran_functions, Fortran_suffixes },
{ "html", HTML_help, HTML_labels, HTML_suffixes },
{ "java", Cjava_help, Cjava_entries, Cjava_suffixes },
@ -881,8 +889,7 @@ linked with GNU getopt.");
Absolute names are stored in the output file as they are.\n\
Relative ones are stored relative to the output file's directory.\n");
if (!CTAGS)
puts ("-a, --append\n\
puts ("-a, --append\n\
Append tag entries to existing tags file.");
puts ("--packages-only\n\
@ -1180,17 +1187,19 @@ main (argc, argv)
globals = TRUE;
}
/* When the optstring begins with a '-' getopt_long does not rearrange the
non-options arguments to be at the end, but leaves them alone. */
optstring = "-";
#ifdef ETAGS_REGEXPS
optstring = "-r:Rc:";
#endif /* ETAGS_REGEXPS */
if (!LONG_OPTIONS)
optstring += 1;
optstring += 1; /* remove the initial '-' */
optstring = concat (optstring,
"Cf:Il:o:SVhH",
(CTAGS) ? "BxdtTuvw" : "aDi:");
"aCf:Il:o:SVhH",
(CTAGS) ? "BxdtTuvw" : "Di:");
while ((opt = getopt_long (argc, argv, optstring, longopts, 0)) != EOF)
while ((opt = getopt_long (argc, argv, optstring, longopts, NULL)) != EOF)
switch (opt)
{
case 0:
@ -1218,6 +1227,7 @@ main (argc, argv)
break;
/* Common options. */
case 'a': append_to_tagfile = TRUE; break;
case 'C': cplusplus = TRUE; break;
case 'f': /* for compatibility with old makefiles */
case 'o':
@ -1267,7 +1277,6 @@ main (argc, argv)
break;
/* Etags options */
case 'a': append_to_tagfile = TRUE; break;
case 'D': constantypedefs = FALSE; break;
case 'i': included_files[nincluded_files++] = optarg; break;
@ -1285,6 +1294,7 @@ main (argc, argv)
/* NOTREACHED */
}
/* No more options. Store the rest of arguments. */
for (; optind < argc; optind++)
{
argbuffer[current_arg].arg_type = at_filename;
@ -1413,7 +1423,7 @@ main (argc, argv)
if (!CTAGS || cxref_style)
{
put_entries (nodehead); /* write the remainig tags (ETAGS) */
put_entries (nodehead); /* write the remaining tags (ETAGS) */
free_tree (nodehead);
nodehead = NULL;
if (!CTAGS)
@ -1465,12 +1475,13 @@ main (argc, argv)
if (fclose (tagf) == EOF)
pfatal (tagfile);
if (update)
{
char cmd[2*BUFSIZ+10];
sprintf (cmd, "sort -o %.*s %.*s", BUFSIZ, tagfile, BUFSIZ, tagfile);
exit (system (cmd));
}
if (CTAGS)
if (append_to_tagfile || update)
{
char cmd[2*BUFSIZ+10];
sprintf (cmd, "sort -o %.*s %.*s", BUFSIZ, tagfile, BUFSIZ, tagfile);
exit (system (cmd));
}
return EXIT_SUCCESS;
}
@ -4075,10 +4086,18 @@ Yacc_entries (inf)
char_pointer = line_buffer.buffer, \
TRUE); \
)
#define LOOKING_AT(cp, keyword) /* keyword is a constant string */ \
(strneq ((cp), keyword, sizeof(keyword)-1) /* cp points at keyword */ \
&& notinname ((cp)[sizeof(keyword)-1]) /* end of keyword */ \
&& ((cp) = skip_spaces((cp)+sizeof(keyword)-1))) /* skip spaces */
#define LOOKING_AT(cp, kw) /* kw is the keyword, a literal string */ \
((assert("" kw), TRUE) /* syntax error if not a literal string */ \
&& strneq ((cp), kw, sizeof(kw)-1) /* cp points at kw */ \
&& notinname ((cp)[sizeof(kw)-1]) /* end of kw */ \
&& ((cp) = skip_spaces((cp)+sizeof(kw)-1))) /* skip spaces */
/* Similar to LOOKING_AT but does not use notinname, does not skip */
#define LOOKING_AT_NOCASE(cp, kw) /* the keyword is a literal string */ \
((assert("" kw), TRUE) /* syntax error if not a literal string */ \
&& strncaseeq ((cp), kw, sizeof(kw)-1) /* cp points at kw */ \
&& ((cp) += sizeof(kw)-1)) /* skip spaces */
/*
* Read a file, but do no processing. This is used to do regexp
@ -4956,7 +4975,7 @@ Lua_functions (inf)
/*
* Postscript tag functions
* Postscript tags
* Just look for lines where the first character is '/'
* Also look at "defineps" for PSWrap
* Ideas by:
@ -4985,6 +5004,43 @@ PS_functions (inf)
}
}
/*
* Forth tags
* Ignore anything after \ followed by space or in ( )
* Look for words defined by :
* Look for constant, code, create, defer, value, and variable
* OBP extensions: Look for buffer:, field,
* Ideas by Eduardo Horvath <eeh@netbsd.org> (2004)
*/
static void
Forth_words (inf)
FILE *inf;
{
register char *bp;
LOOP_ON_INPUT_LINES (inf, lb, bp)
while ((bp = skip_spaces (bp))[0] != '\0')
if (bp[0] == '\\' && iswhite(bp[1]))
break; /* read next line */
else if (bp[0] == '(' && iswhite(bp[1]))
do /* skip to ) or eol */
bp++;
while (*bp != ')' && *bp != '\0');
else if ((bp[0] == ':' && iswhite(bp[1]) && bp++)
|| LOOKING_AT_NOCASE (bp, "constant")
|| LOOKING_AT_NOCASE (bp, "code")
|| LOOKING_AT_NOCASE (bp, "create")
|| LOOKING_AT_NOCASE (bp, "defer")
|| LOOKING_AT_NOCASE (bp, "value")
|| LOOKING_AT_NOCASE (bp, "variable")
|| LOOKING_AT_NOCASE (bp, "buffer:")
|| LOOKING_AT_NOCASE (bp, "field"))
get_tag (skip_spaces (bp), NULL); /* Yay! A definition! */
else
bp = skip_non_spaces (bp);
}
/*
* Scheme tag functions
@ -4994,7 +5050,6 @@ PS_functions (inf)
* (set! xyzzy
* Original code by Ken Haase (1985?)
*/
static void
Scheme_functions (inf)
FILE *inf;
@ -5213,11 +5268,6 @@ Texinfo_nodes (inf)
}
/* Similar to LOOKING_AT but does not use notinname, does not skip */
#define LOOKING_AT_NOCASE(cp, kw) /* kw is a constant string */ \
(strncaseeq ((cp), kw, sizeof(kw)-1) /* cp points at kw */ \
&& ((cp) += sizeof(kw)-1)) /* skip spaces */
/*
* HTML support.
* Contents of <title>, <h1>, <h2>, <h3> are tags.
@ -5434,7 +5484,7 @@ prolog_pr (s, last)
|| (s[pos] == '(' && (pos += 1))
|| (s[pos] == ':' && s[pos + 1] == '-' && (pos += 2)))
&& (last == NULL /* save only the first clause */
|| len != strlen (last)
|| len != (int)strlen (last)
|| !strneq (s, last, len)))
{
make_tag (s, len, TRUE, s, pos, lineno, linecharno);
@ -6502,7 +6552,7 @@ etags_strncasecmp (s1, s2, n)
: *s1 - *s2);
}
/* Skip spaces, return new pointer. */
/* Skip spaces (end of string is not space), return new pointer. */
static char *
skip_spaces (cp)
char *cp;
@ -6512,7 +6562,7 @@ skip_spaces (cp)
return cp;
}
/* Skip non spaces, return new pointer. */
/* Skip non spaces, except end of string, return new pointer. */
static char *
skip_non_spaces (cp)
char *cp;

2
lisp/.gitignore vendored
View File

@ -1,6 +1,8 @@
*.elc
MANIFEST
Makefile
Makefile.unix
makefile
elc.tar.gz
cus-load.el
finder-inf.el

View File

@ -1,9 +1,863 @@
2005-10-06 Masatake YAMATO <jet@gyve.org>
* progmodes/gdb-ui.el (gdb-info-breakpoints-custom): Put
`font-lock-function-name-face'.
(gdb-info-frames-custom): Put `font-lock-function-name-face'
and `font-lock-variable-name-face'
(gdb-registers-font-lock-keywords): New font lock keywords definition.
(gdb-registers-mode): Use `gdb-registers-font-lock-keywords`.
(gdb-memory-font-lock-keywords): New font lock keywords definition.
(gdb-memory-mode): Use `gdb-memory-font-lock-keywords'.
(gdb-local-font-lock-keywords): New font lock keywords definition.
(gdb-locals-mode): Use `gdb-local-font-lock-keywords'
(gdb-threads-font-lock-keywords): New font lock keywords definition.
(gdb-threads-mode): Use `gdb-threads-font-lock-keywords'.
2005-10-05 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/scheme.el (scheme-mode-syntax-table): Mark ; as being
also the second char of a comment-start sequence.
(scheme-sexp-comment-syntax-table): New var.
(lambda, define): Set their scheme-doc-string-elt property.
(scheme-font-lock-syntactic-face-function): Handle sexp-comments.
Use lisp-font-lock-syntactic-face-function now that it properly
handles |...| symbols.
(scheme-mode-variables): Set lisp-doc-string-elt-property,
parse-sexp-lookup-properties and font-lock-extra-managed-props.
* emacs-lisp/lisp-mode.el (lisp-mode-syntax-table): Move the nesting
bit from # to |.
(lisp-font-lock-syntactic-face-function): Distinguish |...| symbols.
* emacs-lisp/lisp-mode.el (lambda): Add its doc-string-elt property.
(lisp-doc-string-elt-property): New var.
(lisp-font-lock-syntactic-face-function): Use it.
Rewrite to recognize docstrings even for forms not at toplevel.
* progmodes/scheme.el (scheme-mode-syntax-table): Put the nested
annotation on the | part of #| rather than on the # part.
(scheme-font-lock-syntactic-face-function): New function, to
distinguish strings from |...| symbols.
(scheme-mode-variables): Use it. Also fix up the font-lock-time
syntax-table so that #|...|# is properly highlighted.
* emacs-lisp/lisp-mode.el (lisp-font-lock-syntactic-face-function):
Don't mark as docstring the 3rd elem of an unknown toplevel form.
2005-10-04 Stefan Monnier <monnier@iro.umontreal.ca>
* bindings.el (global-map): Resync [home] and [end] bindings with C-a
and C-e.
* emacs-lisp/eldoc.el: Move comments into docstrings.
(eldoc-message-commands): Initialize in its declaration.
Add move-beginning-of-line and move-end-of-line.
(eldoc-add-command, eldoc-add-command-completions)
(eldoc-remove-command, eldoc-remove-command-completions): Simplify.
* outline.el (outline-mark-subtree): Activate the mark.
* calendar/appt.el (appt-time-regexp): New var.
(appt-add, appt-make-list): Use it.
(appt-convert-time): Clean up.
* textmodes/tex-mode.el (tex-font-lock-syntactic-face-function):
Don't set any syntax-table property here.
(tex-font-lock-verb): New function. Do it here.
(tex-font-lock-syntactic-keywords): Use it.
2005-10-04 Richard M. Stallman <rms@gnu.org>
* wid-edit.el (widget-file-complete): Get the widget start point
the right way. Default directory to `/' if file has none.
* x-dnd.el (x-dnd-drop-data): Check for dedicated windows.
* textmodes/flyspell.el (flyspell-mode-on):
Call ispell-maybe-find-aspell-dictionaries.
* textmodes/ispell.el (ispell-word, ispell-region):
Call ispell-maybe-find-aspell-dictionaries.
(ispell-accept-buffer-local-defs):
Don't call ispell-maybe-find-aspell-dictionaries
2005-10-04 Richard M. Stallman <rms@gnu.org>
* iswitchb.el (iswitchb-buffer-ignore): Label it risky.
2005-10-04 Emilio C. Lopes <eclig@gmx.net>
* iswitchb.el (iswitchb-ignore-buffername-p): Use `functionp'
instead of `fboundp' in order to allow for anonymous functions.
2005-10-04 Chong Yidong <cyd@stupidchicken.com>
* info.el (Info-next, Info-prev, Info-up): Select info buffer, in
case the user clicks on the link while another window is selected.
(Info-speedbar-hierarchy-buttons): Use speedbar-current-frame.
* dframe.el (dframe-update-keymap): Use mouse-1-click-follows-link
functionality.
(dframe-help-echo): Save point in case mouse tracking is off.
2005-10-04 Thien-Thi Nguyen <ttn@gnu.org>
* net/ange-ftp.el (ange-ftp-ls): Fix typo introduced in last change.
2005-10-03 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/cc-styles.el (c-setup-paragraph-variables): Make sure we do
not change the global value of those vars.
* progmodes/cc-mode.el (c-basic-common-init): Remove calls to
make-local-variable which we do not need any more.
2005-10-03 Chong Yidong <cyd@stupidchicken.com>
* speedbar.el (speedbar-ignored-path-regexp, speedbar-line-path)
(speedbar-ignored-path-expressions, speedbar-buffers-line-path)
(speedbar-add-ignored-path-regexp, speedbar-buffers-line-path)
(speedbar-path-line): Define obsolete aliases.
(speedbar-line-directory): Doc fix.
* progmodes/vhdl-mode.el (vhdl-speedbar-initialize)
(vhdl-speedbar-rescan-hierarchy): Call speedbar-line-directory
instead of speedbar-line-path.
2005-10-03 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* x-dnd.el (x-dnd-drop-data): Don't set dnd-open-file-other-window
to nil if dropping on a window. Handle dropping on a minibuffer window
like dropping on a non-window part of Emacs.
2005-10-03 Stefan Monnier <monnier@iro.umontreal.ca>
* net/ange-ftp.el: Use with-current-buffer.
(ange-ftp-insert-directory): Do not follow symlinks any more.
* textmodes/ispell.el (ispell-find-aspell-dictionaries):
Remove interactive spec.
2005-10-03 Kim F. Storm <storm@cua.dk>
* ido.el (ido-mode): Use custom-initialize-set.
2005-10-02 Richard M. Stallman <rms@gnu.org>
* progmodes/ebnf2ps.el (ebnf-eps-production-list):
Use insert-buffer-substring.
* net/tramp.el: Pacify byte compiler warnings in pacification code.
(tramp-handle-file-local-copy): Use insert-buffer-substring.
2005-10-02 Stefan Monnier <monnier@iro.umontreal.ca>
* net/ange-ftp.el (ange-ftp-insert-directory): Undo unintended part
in last change.
(ange-ftp-insert-directory): Fix up the search for the case where
`file' is absolute.
2005-10-02 Romain Francoise <romain@orebokech.com>
* progmodes/compile.el (compile-goto-error): Delete extra paren.
2005-10-02 Andreas Schwab <schwab@suse.de>
* ediff-ptch.el (ediff-fixup-patch-map): Handle file names without
directory component in the session info.
2005-10-01 Richard M. Stallman <rms@gnu.org>
* comint.el (comint-redirect-subvert-readonly): Doc fix.
* simple.el (next-error-internal): New function.
* progmodes/compile.el (compilation-buffer-name): New arg MODE-COMMAND.
(compilation-start): Pass new arg to compilation-buffer-name.
(compile-goto-error): Use next-error-internal.
2005-10-01 Chong Yidong <cyd@stupidchicken.com>
* speedbar.el: Remove RCS tag.
(speedbar-check-read-only): Handle non-existent files.
* dframe.el, ezimage.el, sb-image.el: Remove RCS tags.
* info.el (Info-speedbar-hierarchy-buttons)
(Info-speedbar-goto-node): Call speedbar-select-attached-frame.
2005-10-01 Roland Winkler <Roland.Winkler@physik.uni-erlangen.de>
* textmodes/bibtex.el (bibtex-valid-entry-whitespace-re):
Do not match newline.
(bibtex-realign): Do not use bibtex-valid-entry-whitespace-re.
(bibtex-summary): Remove unnecessary save-excursion.
(bibtex-fill-field-bounds): Use fill-region-as-paragraph.
2005-10-01 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* term/mac-win.el: Add charset info for "iso10646-1".
Modify default fontset to use ATSUI-compatible fonts for some charsets
if available.
2005-10-01 Chong Yidong <cyd@stupidchicken.com>
* speedbar.el: Re-apply arch tag.
(speedbar-version): Rename to version 1.0. Suggested by Eric
M. Ludlam.
Reapply two changes from Emacs CVS' version of speedbar lost
during the merge:
(speedbar-use-imenu-flag): Avoid unnecessary use of locate-library.
(speedbar-frame-parameters): Improve customize type.
2005-09-30 Stefan Monnier <monnier@iro.umontreal.ca>
* net/ange-ftp.el (ange-ftp-gwp-start): Use with-current-buffer.
(ange-ftp-file-directory-p): Fix the symlink case.
(ange-ftp-insert-directory): When listing a single file, get a list of
the parent buffer and extract the relevant line. Inspired from a patch
by Katsumi Yamaoka <yamaoka@jpl.org>.
(ange-ftp-file-name-sans-versions): Simplify.
2005-09-30 Bill Wohler <wohler@newt.com>
Move MH-E image files from toolbar and mail directories into
etc/images.
* mail/reply2.*: Move to etc/images/mail/reply*.
* toolbar/execute.*, toolbar/highlight.*, toolbar/mh-logo.xpm:
* toolbar/page-down.*, toolbar/show.*, toolbar/widen.*: Move to
etc/images.
* toolbar/alias.*, toolbar/refile.*, toolbar/repack.*:
* toolbar/reply*: Move to etc/images/mail.
* toolbar/rescan.*: Move and rename to etc/images/refresh.*.
2005-09-30 Eric M. Ludlam <zappo@gnu.org>
* speedbar.el: New version 1.0pre3.
Frame management code (including timer, and mouse click specifics)
moved to dframe.el:
(speedbar-attached-frame): Removed. Use dframe-attached-frame.
(speedbar-timer): Removed. Use dframe-timer.
(speedbar-close-frame): Removed. Use dframe-close-frame.
(speedbar-activity-change-focus-flag): Removed. Use
dframe-activity-change-focus-flag.
(speedbar-update-speed, speedbar-navigating-speed): Obsolete. Use
dframe-update-speed.
(speedbar-current-frame): New macro. Use this instead of the
variable speedbar-frame.
(speedbar-use-images, speedbar-expand-image-button-alist)
(speedbar-insert-image-button-maybe): Moved to sb-image.el.
(speedbar-find-image-on-load-path): Removed. Replaced by
defezimage in ezimage.el.
(speedbar-expand-image-button-alist): Removed. Replaced by
ezimage-expand-image-button-alist in ezimage.el.
(speedbar-ignored-directory-regexp)
(speedbar-add-ignored-directory-regexp)
(speedbar-ignored-directory-expressions)
(speedbar-line-directory, speedbar-buffers-line-directory)
(speedbar-directory-line, speedbar-buffers-line-directory):
Renamed, replacing `path' with `directory'.
(speedbar-create-directory, speedbar-expand-line-descendants)
(speedbar-toggle-line-expansion)
(speedbar-contract-line-descendants): New commands.
(speedbar-query-confirmation-method, speedbar-select-frame-method)
(speedbar-use-tool-tips-flag): New options.
(speedbar-check-read-only, speedbar-require-version)
(speedbar-insert-separator, speedbar-buffers-tail-notes)
(speedbar-handle-delete-frame, speedbar-try-completion)
(speedbar-update-localized-contents): New functions.
(speedbar-incompatible-version, speedbar-ro-to-do-point)
(speedbar-object-read-only-indicator): New variables.
(speedbar-visiting-tag-hook, speedbar-before-visiting-file-hook):
New hooks.
(speedbar-separator-face): New face.
(speedbar-supported-extension-expressions): Add `.g' and `.ma?k'.
(speedbar-ignored-modes): Add fundamental-mode.
(speedbar-directory-unshown-regexp): Add . directories.
(speedbar-key-map): Remove old SPC and DEL page up/down keys.
(speedbar-file-key-map): Add SPC to toggle node expansion, `[' and
`]' for full expand/close.
(speedbar-buffers-key-map): Add SPC to toggle node expansion.
(speedbar-check-vc): Support hidden files.
(speedbar-vc-check-dir-p): Use vc-state if available for CVS.
(speedbar-this-file-in-vc): Use vc-state if available. If VC
state is nil, it is not checked out.
(speedbar-line-text, speedbar-line-token): Support expand buttons
with no text.
(speedbar-refresh): Universal argument acts as power-click.
(speedbar-fetch-dynamic-tags): If a buffer is in Emacs, switch to
that buffer to get variable values.
And many other bugfixes.
* dframe.el, ezimage.el, sb-image.el: New files.
* sb-*.xpm: Remove files. New image files installed into
etc/images/ezimage.
2005-09-30 Kenichi Handa <handa@m17n.org>
* ps-mule.el (ps-mule-show-warning): If a character is in
ps-print-translation-table, don't treat it as non-printable.
2005-09-30 David Ponce <david@dponce.com>
* tree-widget.el (tree-widget-themes-load-path): New variable.
(tree-widget-themes-directory): Doc fix.
(tree-widget-image-formats) [Emacs]: Doc fix.
(tree-widget--locate-sub-directory): New function.
(tree-widget-themes-directory): Use it.
* recentf.el (recentf-filename-handlers): Rename from
`recentf-filename-handler'. Allow a list of functions.
(recentf-menu-items-for-commands): Fix :help strings.
(recentf-apply-filename-handlers): New function.
(recentf-expand-file-name): Use it.
(recentf-cleanup): Remove duplicates too.
2005-09-29 Juri Linkov <juri@jurta.org>
* faces.el: Rearrange face definitions to be in the same order as
their face descriptions in "(emacs)Standard Faces".
* isearch.el (isearch, lazy-highlight): Add group `basic-faces'.
* tooltip.el (tooltip): Add group `basic-faces'.
* buff-menu.el (Buffer-menu-buffer): Remove group
`font-lock-highlighting-faces'.
* progmodes/compile.el (compilation-error, compilation-warning)
(compilation-info, compilation-line-number, compilation-column-number):
Change group from `font-lock-highlighting-faces' to `compilation'.
* progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
(vhdl-font-lock-attribute-face, vhdl-font-lock-enumvalue-face)
(vhdl-font-lock-function-face, vhdl-font-lock-directive-face)
(vhdl-font-lock-reserved-words-face)
(vhdl-font-lock-translate-off-face, syntax-alist): Remove group
`font-lock-highlighting-faces'.
* cus-edit.el (custom-buffer-sort-alphabetically): Default to nil.
2005-09-28 Kim F. Storm <storm@cua.dk>
* emulation/cua-base.el: Set CUA move property on additional commands:
up-list, down-list, backward-up-list, end-of-defun beginning-of-defun,
forward-sexp, backward-sexp, forward-list, backward-list.
2005-09-28 Romain Francoise <romain@orebokech.com>
* comint.el (comint-show-output): Really set point at the
beginning of the output when not using `comint-use-prompt-regexp'.
2005-09-27 Jay Belanger <belanger@truman.edu>
* calc/calc-lang.el (math-oper-table): Raise the precedence of "/"
in TeX mode.
2005-09-26 Juanma Barranquero <lekktu@gmail.com>
* textmodes/org.el (org-table-sum): Fix format string.
* textmodes/tex-mode.el (tex-insert-quote, latex-indent):
Quote face names.
2005-09-26 Romain Francoise <romain@orebokech.com>
* isearch.el (isearch-forward-regexp): Close doc string.
2005-09-25 Richard M. Stallman <rms@gnu.org>
* simple.el (blink-matching-open): Don't no-op when point is BEGV+1.
* isearch.el (isearch-forward, isearch-forward-regexp): Doc fixes.
* progmodes/compile.el (compilation-error-properties):
When getting the file from the previous error message,
correctly decode the new data format.
* progmodes/cc-cmds.el (c-electric-paren):
Call old-blink-paren only for close-paren.
2005-09-24 Andreas Schwab <schwab@suse.de>
* term/rxvt.el (rxvt-register-default-colors): Delete redundant
condition.
2005-09-25 Romain Francoise <romain@orebokech.com>
* dired-aux.el (dired-copy-file-recursive):
* dired.el (dired-delete-file):
* ediff-mult.el (ediff-dir-diff-copy-file):
* ediff-util.el (ediff-test-save-region):
* forms.el (forms-mode):
* ido.el (ido-file-internal, ido-delete-file-at-head):
* log-edit.el (log-edit-done):
* ses.el (ses-yank-resize):
* play/gomoku.el (gomoku-human-plays, gomoku)
(gomoku-human-resigns, gomoku-prompt-for-other-game)
(gomoku-offer-a-draw):
* play/landmark.el (lm-human-resigns, lm):
* net/eudcb-ldap.el (eudc-ldap-check-base):
* play/mpuz.el (mpuz-offer-abort, mpuz-try-letter, mpuz-close-game):
* progmodes/ebrowse.el (ebrowse-find-pattern):
* progmodes/idlw-shell.el (idlwave-shell-set-bp-check):
* textmodes/reftex-index.el (reftex-index-initialize-phrases-buffer):
End `yes-or-no-p' and `y-or-n-p' prompts with question mark and space.
* vc.el (vc-delete-file):
* play/gomoku.el (gomoku-terminate-game, gomoku)
(gomoku-prompt-for-move, gomoku-human-takes-back):
* play/landmark.el (lm-human-takes-back, lm-prompt-for-move)
(lm-start-robot, lm-human-plays): Remove extraneous spaces in messages.
2005-09-24 Dan Nicolaescu <dann@ics.uci.edu>
* term/rxvt.el (rxvt-register-default-colors): Add support for 255
color rxvt terminals by using the code xterm.el used to use before
2005-04-09 in order to match the colors used by rxvt.
2005-09-24 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
* term/rxvt.el (rxvt-register-default-colors): Add support for 88
colors rxvt-unicode terminals by using the same code as xterm.el.
2005-09-24 Stefan Monnier <monnier@iro.umontreal.ca>
* textmodes/tex-mode.el (tex-font-lock-append-prop)
(tex-font-lock-suscript, tex-insert-quote, latex-indent): Adjust to the
new symbol used for the tex-verbatim face.
2005-09-24 Emilio C. Lopes <eclig@gmx.net>
* woman.el (woman-file-name):
* wid-edit.el (widget-file-prompt-value)
(widget-coding-system-prompt-value):
* w32-fns.el (set-w32-system-coding-system):
* vc.el (vc-version-diff, vc-annotate):
* textmodes/reftex-auc.el (reftex-arg-cite)
(reftex-arg-index-tag):
* textmodes/refer.el (refer-get-bib-files):
* textmodes/artist.el (artist-figlet-choose-font):
* terminal.el (terminal-emulator):
* replace.el (occur-read-primary-args):
* rect.el (string-rectangle, string-insert-rectangle):
* ps-print.el (ps-print-preprint):
* progmodes/pascal.el (pascal-goto-defun):
* progmodes/etags.el (visit-tags-table, visit-tags-table-buffer):
* progmodes/compile.el (compilation-find-file):
* printing.el (pr-interactive-n-up):
* play/animate.el (animate-birthday-present):
* net/rcompile.el (remote-compile):
* man.el (man, Man-goto-section, Man-follow-manual-reference):
* mail/rmailsum.el (rmail-summary-search-backward)
(rmail-summary-search):
* mail/rmailout.el (rmail-output-read-rmail-file-name)
(rmail-output-read-file-name):
* mail/rmail.el (rmail-search, rmail-search-backwards):
* mail/mailabbrev.el (merge-mail-abbrevs, rebuild-mail-abbrevs):
* locate.el (locate):
* international/quail.el (quail-show-keyboard-layout):
* international/mule.el (set-buffer-file-coding-system)
(revert-buffer-with-coding-system, set-file-name-coding-system)
(set-terminal-coding-system, set-keyboard-coding-system)
(set-next-selection-coding-system):
* international/mule-diag.el (describe-coding-system)
(describe-font, describe-fontset):
* international/mule-cmds.el (universal-coding-system-argument)
(search-unencodable-char, describe-input-method)
(set-language-environment, describe-language-environment):
* international/codepage.el (codepage-setup):
* international/code-pages.el (codepage-setup):
* info.el (Info-search, Info-follow-reference)
(Info-search-backward):
* emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-clear-cache, ad-activate)
(ad-deactivate, ad-update, ad-unadvise, ad-read-advice-name)
(ad-enable-advice, ad-disable-advice, ad-remove-advice)
(ad-read-regexp):
* ediff-util.el (ediff-toggle-regexp-match):
* ediff-ptch.el (ediff-prompt-for-patch-file):
* dired-aux.el (dired-diff):
* diff.el (diff):
* cus-edit.el (custom-variable-prompt):
* calendar/timeclock.el (timeclock-ask-for-project):
* calc/calcalg3.el (calc-get-fit-variables):
* calc/calc-store.el (calc-edit-variable)
(calc-permanent-variable):
* vc-mcvs.el (vc-mcvs-register):
* shadowfile.el (shadow-define-literal-group):
* woman.el (woman-file-name):
* vc.el (vc-version-diff, vc-merge):
* textmodes/reftex-index.el (reftex-index-complete-tag):
* format.el (format-decode-buffer, format-decode-region):
* emulation/viper-cmd.el (viper-read-string-with-history):
* emacs-lisp/debug.el (cancel-debug-on-entry):
* emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
* ediff.el (ediff-merge-revisions)
(ediff-merge-revisions-with-ancestor, ediff-revision):
* completion.el (interactive-completion-string-reader):
* calc/calc-prog.el (calc-user-define-formula):
Follow convention for reading with the minibuffer.
2005-09-24 Steven Huwig <steven_h@acm.org> (tiny change)
* progmodes/python.el (python-describe-symbol): Add globals() and
locals() to the arguments of emacs.ehelp.
2005-09-24 Magnus Henoch <mange@freemail.hu>
* textmodes/ispell.el (ispell-maybe-find-aspell-dictionaries):
New function, code extracted from ispell-valid-dictionary-list.
(ispell-valid-dictionary-list, ispell-accept-buffer-local-defs):
Call it.
2005-09-24 Eli Zaretskii <eliz@gnu.org>
* subr.el (version-regexp-alist): Extend valid syntax for version
strings: allow any of the characters -,_,+ to separate the
alpha/beta/rc part from the version part. Doc fix.
(version-to-list): Doc fix. Bind case-fold-search to t, as advertised.
2005-09-23 David Reitter <david.reitter@gmail.com>
* mail/mailclient.el: New file.
2005-09-23 Richard M. Stallman <rms@gnu.org>
* textmodes/flyspell.el (flyspell-highlight-incorrect-region)
(flyspell-incorrect-hook, flyspell-highlight-duplicate-region):
Doc fixes.
* progmodes/cc-mode.el (c-font-lock-init):
Specify font-lock-lines-before.
2005-09-23 Stefan Monnier <monnier@iro.umontreal.ca>
* smerge-mode.el (smerge-remove-props): Cause re-highlighting of the
whole conflict.
2005-09-23 Carsten Dominik <dominik@science.uva.nl>
* textmodes/org.el (org-mode-map, orgtbl-mode-map):
Move keybindings with `C-c C-h' prefix to `C-c C-x' prefix. Make use
of `remap' feature when available. Additional key bindings for
better tty support.
(org-mode-restart, org-force-self-insert): New commands.
(org-time-stamp-inactive): New command.
(org-remap): New function.
(org-table-auto-blank-field, org-level-color-stars-only): New options.
(org-enable-fixed-width-editor): Move to `org-structure'
customization group.
(org-self-insert-command, orgtbl-self-insert-command): Modify to
blank field after field motion commands.
2005-09-23 Kenichi Handa <handa@m17n.org>
* international/mule-cmds.el (set-language-environment):
Don't check utf-translate-cjk-lang-env is nil or not on deciding if we
have to call utf-translate-cjk-load-tables.
2005-09-22 Stefan Monnier <monnier@iro.umontreal.ca>
* mouse.el (mouse-move-drag-overlay): Fix last change.
2005-09-22 David Ponce <david@dponce.com>
* tree-widget.el (tree-widget-value-create): Fix previous change.
2005-09-21 Dan Nicolaescu <dann@ics.uci.edu>
* term/xterm.el (terminal-init-xterm): Fix loading rxvt at run time.
2005-09-21 Stefan Monnier <monnier@iro.umontreal.ca>
* mouse.el (mouse-move-drag-overlay): New function.
(mouse-drag-region-1): Use it.
Try to simplify a bit the state handling. Handle clicks on links
inside intangible areas.
(mouse-save-then-kill): Minor simplification.
(mouse-secondary-overlay): Make it always non-nil instead of
recreating it each time.
(mouse-start-secondary, mouse-set-secondary, mouse-drag-secondary)
(mouse-kill-secondary, mouse-secondary-save-then-kill):
Simplify accordingly.
2005-09-21 Dan Nicolaescu <dann@ics.uci.edu>
* term/rxvt.el (rxvt-standard-colors): Fix some colors.
2005-09-20 Michael Kifer <kifer@cs.stonybrook.edu>
* ediff-ptch.el (ediff-prompt-for-patch-file): More intuitive prompt.
(ediff-file-name-sans-prefix): Treat nil as an empty string.
(ediff-fixup-patch-map): Better heuristic for intuiting the file names
to patch.
* ediff-util.el: Use insert-buffer-substring.
* ediff-vers.el (cvs-run-ediff-on-file-descriptor): Bug fix.
* emulation/viper-cmd.el (viper-change-state): Don't move over the
field boundaries in the minibuffer.
(viper-set-minibuffer-style): Add viper-minibuffer-post-command-hook.
(viper-minibuffer-post-command-hook): New hook.
(viper-line): Don't move cursor at bolp.
* emulation/viper-ex.el (ex-pwd, viper-info-on-file): Fix message.
* emulation/viper-init.el: Add alias to make-variable-buffer-local to
avoid compiler warnings.
* emulation/viper-macs.el (ex-map): Better messages.
* emulation/viper-utils.el (viper-beginning-of-field): New function.
* emulation/viper.el: Replace make-variable-buffer-local with
viper-make-variable-buffer-local everywhere, to avoid warnings.
2005-09-19 Stefan Monnier <monnier@iro.umontreal.ca>
* mouse.el (mouse-drag-mode-line-1, mouse-drag-vertical-line):
Delete unused var `old-selected-window'.
(mouse-drag-region-1): Delete unused vars `start-frame', `end-of-range'.
(mouse-drag-secondary): Delete unused var `start-frame'.
2005-09-19 Emanuele Giaquinta <emanuele.giaquinta@gmail.com> (tiny change)
* term/rxvt.el (terminal-init-rxvt): Add entry for [end].
2005-09-19 Stefan Monnier <monnier@iro.umontreal.ca>
* calendar/calendar.el (mark-visible-calendar-date): Save excursion.
Re-indent within 80 columns. Use inhibit-read-only.
2005-09-19 Romain Francoise <romain@orebokech.com>
* calendar/diary-lib.el (mark-diary-entries): Revert last change.
2005-09-19 Stefan Monnier <monnier@iro.umontreal.ca>
* font-lock.el (font-lock-default-fontify-region): Don't add a line
unconditionally, since the after-change-function already did it.
2005-09-19 Miles Bader <miles@gnu.org>
* net/newsticker.el: Get rid of CVS keyword.
2005-09-19 Johan Bockg,Ae(Brd <bojohan+sf@dd.chalmers.se>
* dired-aux.el (dired-handle-overwrite): Don't use `format' here.
The prompt is formatted later.
2005-09-19 David Ponce <david@dponce.com>
* tree-widget.el (tree-widget-value-create): Save the converted
tree :node widget.
2005-09-19 Juanma Barranquero <lekktu@gmail.com>
* progmodes/sh-script.el (sh-blink): Fix spurious reference to
variable `message'.
2005-09-18 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-login-prompt-regexp): Expand regexp in order
to cover prompts like "login as:". Reported by Slawomir Nowaczyk
<slawomir.nowaczyk.847@student.lu.se>.
2005-09-18 Chong Yidong <cyd@stupidchicken.com>
* image.el (image-load-path): Use symbol `data-directory' instead
of its value, for backward compatibility with packages that bind
it during `find-image'. Suggested by Katsumi Yamaoka.
(image-search-load-path): Handle symbols whose values are strings.
2005-09-18 Romain Francoise <romain@orebokech.com>
* calendar/diary-lib.el (mark-diary-entries): Rearrange to wrap
with-current-buffer form in save-excursion.
2005-09-18 D Goel <deego@gnufans.org>
* apropos.el (apropos-command): Fix `message' call: first arg
should be a format spec. In this and all other cases that appear
below and elsewhere in the source code, I made a change only when
two conditions were satisfied: [1] I can think of a possibility
that the arguments would cause an error, for example, the code in
question relies on external variables such as filenames. [2] I
was sure that the arg to `message' could not have been nil in the code.
* textmodes/tildify.el (tildify-region): Ditto.
* textmodes/reftex-index.el (reftex-index-change-entry)
(reftex-index-phrase-selection-or-word, reftex-query-index-phrase):
* textmodes/reftex-dcr.el (reftex-echo-ref, reftex-echo-cite):
* textmodes/org.el (org-complete, org-deadline, org-schedule)
(org-priority, org-table-sum):
* textmodes/ispell.el (ispell-check-version, ispell-parse-output):
* textmodes/flyspell.el (flyspell-mode-on, flyspell-notify-misspell)
(flyspell-word, flyspell-display-next-corrections):
* textmodes/bibtex.el (bibtex-print-help-message):
* textmodes/artist.el (artist-key-set-point-poly):
* term/mac-win.el (mac-services-insert-text):
* progmodes/vhdl-mode.el (vhdl-warning, vhdl-print-warnings)
(vhdl-hooked-abbrev, vhdl-template-insert-fun)
(vhdl-port-paste-testbench, vhdl-compose-new-component)
(vhdl-compose-configuration):
* progmodes/sh-script.el (sh-blink, sh-show-indent)
(sh-set-indent, sh-learn-line-indent):
* progmodes/ps-mode.el (ps-mode-target-column):
* progmodes/idlwave.el (idlwave-make-tags)
(idlwave-scan-library-catalogs):
* progmodes/idlw-shell.el (idlwave-shell-parse-stack-and-display):
* progmodes/gud.el (gud-jdb-analyze-source):
* progmodes/flymake.el (flymake-log):
* progmodes/ebnf2ps.el (ebnf-generate-region):
* progmodes/cmacexp.el (c-macro-expansion):
* progmodes/ada-xref.el (ada-treat-cmd-string):
* progmodes/ada-mode.el (ada-create-case-exception-substring)
(ada-justified-indent-current, ada-batch-reformat):
* play/zone.el (zone):
* play/landmark.el (lm-move):
* play/decipher.el (decipher-show-alphabet):
* net/newsticker.el (newsticker--display-jump)
(newsticker--display-scroll):
* mail/rmail-spam-filter.el (rsf-add-subject-to-spam-list)
(rsf-add-sender-to-spam-list, rsf-add-region-to-spam-list):
* mail/feedmail.el (feedmail-dump-message-to-queue):
* eshell/esh-proc.el (eshell-remove-process-entry):
* emulation/ws-mode.el (ws-last-error):
* emulation/viper-macs.el (ex-map-read-args, ex-unmap-read-args)
(viper-record-kbd-macro):
* emulation/viper-ex.el (ex-pwd, viper-info-on-file):
* emacs-lisp/lisp-mnt.el (lm-report-bug):
* emacs-lisp/find-func.el (find-function-noselect):
* calendar/timeclock.el (timeclock-status-string)
(timeclock-workday-remaining-string, timeclock-workday-elapsed-string)
(timeclock-when-to-leave-string):
* calendar/icalendar.el (icalendar--convert-ical-to-diary):
* calc/calc-units.el (calc-enter-units-table):
* calc/calc-mode.el (calc-mode-record-mode):
* woman.el (woman-mini-help):
* wdired.el (wdired-change-to-wdired-mode):
* vc.el (vc-retrieve-snapshot):
* strokes.el (strokes-read-stroke, strokes-read-complex-stroke):
* startup.el (display-startup-echo-area-message):
* simple.el (set-goal-column):
* ses.el (ses-command-hook, ses-recalculate-cell):
* server.el (server-process-filter):
* printing.el (pr-interface-txt-print, pr-interface-printify)
(pr-interface-ps):
* pcvs.el (cvs-help):
* log-edit.el (log-edit, log-edit-mode-help):
* iswitchb.el (iswitchb-possible-new-buffer):
* isearch.el (isearch-edit-string):
* image-mode.el (image-mode, image-minor-mode):
* ibuf-macs.el (define-ibuffer-filter):
* hi-lock.el (hi-lock-find-patterns):
* files.el (toggle-read-only):
* ediff-util.el (ediff-copy-diff)
(ediff-write-merge-buffer-and-maybe-kill):
* echistory.el (Electric-history-undefined):
* dnd.el (dnd-insert-text):
* dired-aux.el (dired-query):
* desktop.el (desktop-restore-file-buffer, desktop-lazy-create-buffer):
* bookmark.el (bookmark-bmenu-locate):
* obsolete/fast-lock.el (@top-level) <with-temp-message macro>:
Fix `message' calls to ensure first arg is a format string.
The change was made only when these two conditions were satisfied:
[1] when there is a possibility that the arguments would cause an error
for example, if the code in question relies on external variables
such as filenames, and
[2] if the arg to `message' could not have been nil in the code.
* pcomplete.el (pcomplete--help): Fix `message' format spec.
Not having a %s would be weird, though not technically wrong.
2005-09-18 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* term/mac-win.el (mac-add-charset-info): Doc fix.
2005-09-17 Romain Francoise <romain@orebokech.com>
* shell.el (shell-resync-dirs): Handle echoing processes more
reliably. Don't insert resync command if `comint-process-echoes'
is non-nil.
2005-09-17 Magnus Henoch <mange@freemail.hu>
* textmodes/ispell.el (ispell-aspell-supports-utf8): New variable.
(ispell-check-version): Set ispell-aspell-supports-utf8 to t for
aspell versions >= 0.60.
(ispell-valid-dictionary-list): Call ispell-find-aspell-dictionaries
only if ispell-aspell-supports-utf8 is non-nil.
2005-09-17 Johan Bockg,Ae(Brd <bojohan@dd.chalmers.se>
* progmodes/scheme.el (scheme-mode-variables): Use setq to assign
buffer-local value to lisp-indent-function.
2005-09-17 Milan Zamazal <pdm@zamazal.org>
* progmodes/glasses.el (glasses-make-readable): If
glasses-separator differs from underscore, put appropriate
overlays over underscore characters.
(glasses-convert-to-unreadable): If glasses-separator differs from
underscore, try to convert glasses-separator characters to
underscores.
2005-09-16 Stefan Monnier <monnier@iro.umontreal.ca>
* calendar/diary-lib.el (mark-diary-entries): Don't move point.
Use with-syntax-table and dolist.
2005-09-16 Carsten Dominik <dominik@science.uva.nl>
* textmodes/reftex-auc.el:
* textmodes/reftex-cite.el:
* textmodes/reftex-dcr.el:
* textmodes/reftex-global.el:
* textmodes/reftex-parse.el:
* textmodes/reftex-ref.el:
* textmodes/reftex-sel.el:
* textmodes/reftex-toc.el:
* textmodes/reftex-vars.el:
* textmodes/reftex.el: Small changes to remove compiler warnings.
* textmodes/reftex-index.el: Likewise.
(reftex-query-index-phrase): More efficient use of markers.
2005-09-15 Chong Yidong <cyd@stupidchicken.com>
* image.el (image-load-path): New variable.
(image-search-load-path): New function.
(find-image): Search for images in `image-load-path'.
2005-09-15 Richard M. Stallman <rms@gnu.org>
* follow.el: Change Maintainer field.
2005-09-15 David Ponce <david@dponce.com>
* recentf.el (recentf-save-file-modes): New option.
@ -244,20 +1098,12 @@
* descr-text.el (describe-property-list): Handle non-symbol prop names.
2005-08-30 Richard M. Stallman <rms@gnu.org>
2005-09-08 Richard M. Stallman <rms@gnu.org>
* simple.el (blink-matching-open): Get rid of text props from
the string shown in echo area. Don't permanently set point.
Some rearrangements.
* files.el (risky-local-variable-p):
Match `-predicates' and `-commands.
* cus-edit.el (custom-buffer-sort-alphabetically): Default to t.
(custom-save-all): Visit the file if necessary;
kill the buffer if we created it.
(custom-save-delete): Don't visit file or kill buffer here.
2005-09-08 Reiner Steib <Reiner.Steib@gmx.de>
* recentf.el (recentf-filename-handler): Add custom choice

View File

@ -443,7 +443,7 @@ satisfy the predicate VAR-PREDICATE."
(setq p (cdr p))))
(and (apropos-print t nil)
message
(message message))))
(message "%s" message))))
;;;###autoload

View File

@ -748,7 +748,7 @@ language you are using."
;; natural bindings for terminal keycaps --- defined in X keysym order
(define-key global-map [C-S-backspace] 'kill-whole-line)
(define-key global-map [home] 'beginning-of-line)
(define-key global-map [home] 'move-beginning-of-line)
(define-key global-map [C-home] 'beginning-of-buffer)
(define-key global-map [M-home] 'beginning-of-buffer-other-window)
(define-key esc-map [home] 'beginning-of-buffer-other-window)
@ -768,7 +768,7 @@ language you are using."
(define-key global-map [M-prior] 'scroll-other-window-down)
(define-key esc-map [prior] 'scroll-other-window-down)
(define-key esc-map [?\C-\S-v] 'scroll-other-window-down)
(define-key global-map [end] 'end-of-line)
(define-key global-map [end] 'move-end-of-line)
(define-key global-map [C-end] 'end-of-buffer)
(define-key global-map [M-end] 'end-of-buffer-other-window)
(define-key esc-map [end] 'end-of-buffer-other-window)

View File

@ -2058,7 +2058,7 @@ To carry out the deletions that you've marked, use \\<bookmark-bmenu-mode-map>\\
(interactive)
(if (bookmark-bmenu-check-position)
(let ((bmrk (bookmark-bmenu-bookmark)))
(message (bookmark-location bmrk)))))
(message "%s" (bookmark-location bmrk)))))
(defun bookmark-bmenu-relocate ()
"Change the file path of the bookmark on the current line,

View File

@ -77,8 +77,7 @@
(defface Buffer-menu-buffer
'((t (:weight bold)))
"Face used to highlight buffer name."
:group 'Buffer-menu
:group 'font-lock-highlighting-faces)
:group 'Buffer-menu)
(defcustom Buffer-menu-buffer+size-width 26
"*How wide to jointly make the buffer name and size columns."

View File

@ -354,10 +354,10 @@
( "\\times" * 191 190 )
( "*" * 191 190 )
( "2x" * 191 190 )
( "/" / 185 186 )
( "+" + 180 181 )
( "-" - 180 181 )
( "\\over" / 170 171 )
( "/" / 170 171 )
( "\\choose" calcFunc-choose 170 171 )
( "\\mod" % 170 171 )
( "<" calcFunc-lt 160 161 )

View File

@ -408,7 +408,8 @@
((= n 4) 'global)
((= n 5) 'save)
(t 'local)))
(message (cond ((and (eq calc-mode-save-mode 'local) calc-embedded-info)
(message "%s"
(cond ((and (eq calc-mode-save-mode 'local) calc-embedded-info)
"Recording mode changes with [calc-mode: ...]")
((eq calc-mode-save-mode 'edit)
"Recording mode changes with [calc-edit-mode: ...]")

View File

@ -197,7 +197,7 @@
(progn
(setq cmd-base-default (concat "User-" keyname))
(setq cmd (completing-read
(concat "Define M-x command name (default: calc-"
(concat "Define M-x command name (default calc-"
cmd-base-default
"): ")
obarray 'commandp nil
@ -233,7 +233,7 @@
(setq func
(concat "calcFunc-"
(completing-read
(concat "Define algebraic function name (default: "
(concat "Define algebraic function name (default "
cmd-base-default "): ")
(mapcar (lambda (x) (substring x 9))
(all-completions "calcFunc-"

View File

@ -430,7 +430,7 @@
(calc-wrapper
(or var (setq var (calc-read-var-name
(if calc-last-edited-variable
(format "Edit: (default %s) "
(format "Edit (default %s): "
(calc-var-name calc-last-edited-variable))
"Edit: "))))
(or var (setq var calc-last-edited-variable))
@ -587,7 +587,7 @@
(defun calc-permanent-variable (&optional var)
(interactive)
(calc-wrapper
(or var (setq var (calc-read-var-name "Save variable (default=all): ")))
(or var (setq var (calc-read-var-name "Save variable (default all): ")))
(let (calc-pv-pos)
(and var (or (and (boundp var) (symbol-value var))
(error "No such variable")))

View File

@ -515,7 +515,7 @@ Entries are (SYMBOL EXPR DOC-STRING TEMP-TYPE BASE-UNITS).")
(interactive "P")
(and n (setq math-units-table-buffer-valid nil))
(math-build-units-table-buffer t)
(message (substitute-command-keys "Type \\[calc] to return to the Calculator")))
(message "%s" (substitute-command-keys "Type \\[calc] to return to the Calculator")))
(defun calc-define-unit (uname desc)
(interactive "SDefine unit name: \nsDescription: ")

View File

@ -370,7 +370,7 @@
(setq defv (calc-invent-independent-variables nv)))
(or defc
(setq defc (calc-invent-parameter-variables nc defv)))
(let ((vars (read-string (format "Fitting variables: (default %s; %s) "
(let ((vars (read-string (format "Fitting variables (default %s; %s): "
(mapconcat 'symbol-name
(mapcar (function (lambda (v)
(nth 1 v)))

View File

@ -195,7 +195,7 @@ STRING is the description of the appointment.
FLAG, if non-nil, says that the element was made with `appt-add'
so calling `appt-make-list' again should preserve it.")
(defconst appt-max-time 1439
(defconst appt-max-time (1- (* 24 60))
"11:59pm in minutes - number of minutes in a day minus 1.")
(defvar appt-mode-string nil
@ -484,13 +484,15 @@ Usually just deletes the appointment buffer."
lowest-window w)))))
(select-window lowest-window)))
(defconst appt-time-regexp
"[0-9]?[0-9]\\(h\\([0-9][0-9]\\)?\\|[:.][0-9][0-9]\\)\\(am\\|pm\\)?")
;;;###autoload
(defun appt-add (new-appt-time new-appt-msg)
"Add an appointment for today at NEW-APPT-TIME with message NEW-APPT-MSG.
The time should be in either 24 hour format or am/pm format."
(interactive "sTime (hh:mm[am/pm]): \nsMessage: ")
(unless (string-match "[0-9]?[0-9][:.][0-9][0-9]\\(am\\|pm\\)?"
new-appt-time)
(unless (string-match appt-time-regexp new-appt-time)
(error "Unacceptable time-string"))
(let* ((appt-time-string (concat new-appt-time " " new-appt-msg))
(appt-time (list (appt-convert-time new-appt-time)))
@ -577,16 +579,14 @@ appointment package (if it is not already active)."
(calendar-date-equal
(calendar-current-date) (car (car entry-list))))
(let ((time-string (cadr (car entry-list))))
(while (string-match
"\\([0-9]?[0-9][:.][0-9][0-9]\\(am\\|pm\\)?\\).*"
time-string)
(while (string-match appt-time-regexp time-string)
(let* ((beg (match-beginning 0))
;; Get just the time for this appointment.
(only-time (match-string 1 time-string))
(only-time (match-string 0 time-string))
;; Find the end of this appointment
;; (the start of the next).
(end (string-match
"^[ \t]*[0-9]?[0-9][:.][0-9][0-9]\\(am\\|pm\\)?"
(concat "\n[ \t]*" appt-time-regexp)
time-string
(match-end 0)))
;; Get the whole string for this appointment.
@ -633,31 +633,23 @@ APPT-LIST is a list of the same format as `appt-time-msg-list'."
"Convert hour:min[am/pm] format to minutes from midnight.
A period (.) can be used instead of a colon (:) to separate the
hour and minute parts."
(let ((conv-time 0)
(hr 0)
(min 0))
(string-match "[:.]\\([0-9][0-9]\\)" time2conv)
(setq min (string-to-number
(match-string 1 time2conv)))
(string-match "[0-9]?[0-9][:.]" time2conv)
(setq hr (string-to-number
(match-string 0 time2conv)))
;; Formats that should be accepted:
;; 10:00 10.00 10h00 10h 10am 10:00am 10.00am
(let ((min (if (string-match "[h:.]\\([0-9][0-9]\\)" time2conv)
(string-to-number (match-string 1 time2conv))
0))
(hr (if (string-match "[0-9]*[0-9]" time2conv)
(string-to-number (match-string 0 time2conv))
0)))
;; convert the time appointment time into 24 hour time
(cond ((and (string-match "pm" time2conv) (< hr 12))
(setq hr (+ 12 hr)))
((and (string-match "am" time2conv) (= hr 12))
(setq hr 0)))
;; convert the actual time
;; into minutes for comparison
;; against the actual time.
(setq conv-time (+ (* hr 60) min))
conv-time))
;; convert the actual time into minutes.
(+ (* hr 60) min)))
(defun appt-update-list ()
@ -719,5 +711,5 @@ ARG is positive, otherwise off."
(provide 'appt)
;;; arch-tag: bf5791c4-8921-499e-a26f-772b1788d347
;; arch-tag: bf5791c4-8921-499e-a26f-772b1788d347
;;; appt.el ends here

View File

@ -2900,43 +2900,50 @@ interpreted as BC; -1 being 1 BC, and so on."
MARK is a single-character string, a list of face attributes/values, or a face.
MARK defaults to `diary-entry-marker'."
(if (calendar-date-is-legal-p date)
(save-excursion
(set-buffer calendar-buffer)
(calendar-cursor-to-visible-date date)
(let ((mark (or (and (stringp mark) (= (length mark) 1) mark) ; single-char
(and (listp mark) (> (length mark) 0) mark) ; attr list
(and (facep mark) mark) ; face-name
diary-entry-marker)))
(if (facep mark)
(progn ; face or an attr-list that contained a face
(overlay-put
(make-overlay (1- (point)) (1+ (point))) 'face mark))
(if (and (stringp mark)
(= (length mark) 1)) ; single-char
(let ((buffer-read-only nil))
(forward-char 1)
(delete-char 1)
(insert mark)
(forward-char -2))
(let ; attr list
((temp-face
(make-symbol (apply 'concat "temp-"
(mapcar '(lambda (sym)
(cond ((symbolp sym) (symbol-name sym))
((numberp sym) (int-to-string sym))
(t sym))) mark))))
(faceinfo mark))
(make-face temp-face)
;; Remove :face info from the mark, copy the face info into temp-face
(while (setq faceinfo (memq :face faceinfo))
(copy-face (read (nth 1 faceinfo)) temp-face)
(setcar faceinfo nil)
(setcar (cdr faceinfo) nil))
(setq mark (delq nil mark))
;; Apply the font aspects
(apply 'set-face-attribute temp-face nil mark)
(overlay-put
(make-overlay (1- (point)) (1+ (point))) 'face temp-face))))))))
(with-current-buffer calendar-buffer
(save-excursion
(calendar-cursor-to-visible-date date)
(setq mark
(or (and (stringp mark) (= (length mark) 1) mark) ; single-char
(and (listp mark) (> (length mark) 0) mark) ; attr list
(and (facep mark) mark) ; face-name
diary-entry-marker))
(cond
;; face or an attr-list that contained a face
((facep mark)
(overlay-put
(make-overlay (1- (point)) (1+ (point))) 'face mark))
;; single-char
((and (stringp mark) (= (length mark) 1))
(let ((inhibit-read-only t))
(forward-char 1)
;; Insert before delete so as to better preserve markers.
(insert mark)
(delete-char 1)
(forward-char -2)))
(t ;; attr list
(let ((temp-face
(make-symbol
(apply 'concat "temp-"
(mapcar (lambda (sym)
(cond
((symbolp sym) (symbol-name sym))
((numberp sym) (number-to-string sym))
(t sym)))
mark))))
(faceinfo mark))
(make-face temp-face)
;; Remove :face info from the mark, copy the face info into
;; temp-face
(while (setq faceinfo (memq :face faceinfo))
(copy-face (read (nth 1 faceinfo)) temp-face)
(setcar faceinfo nil)
(setcar (cdr faceinfo) nil))
(setq mark (delq nil mark))
;; Apply the font aspects
(apply 'set-face-attribute temp-face nil mark)
(overlay-put
(make-overlay (1- (point)) (1+ (point))) 'face temp-face))))))))
(defun calendar-star-date ()
"Replace the date under the cursor in the calendar window with asterisks.

View File

@ -865,105 +865,99 @@ diary entries."
(let ((marking-diary-entries t)
file-glob-attrs marks)
(with-current-buffer (find-file-noselect (diary-check-diary-file) t)
(setq mark-diary-entries-in-calendar t)
(message "Marking diary entries...")
(setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
(let ((d diary-date-forms)
(old-diary-syntax-table (syntax-table))
temp)
(set-syntax-table diary-syntax-table)
(while d
(let* ((date-form (if (equal (car (car d)) 'backup)
(cdr (car d))
(car d)));; ignore 'backup directive
(dayname
(diary-name-pattern calendar-day-name-array
calendar-day-abbrev-array))
(monthname
(format "%s\\|\\*"
(diary-name-pattern calendar-month-name-array
calendar-month-abbrev-array)))
(month "[0-9]+\\|\\*")
(day "[0-9]+\\|\\*")
(year "[0-9]+\\|\\*")
(l (length date-form))
(d-name-pos (- l (length (memq 'dayname date-form))))
(d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos)))
(m-name-pos (- l (length (memq 'monthname date-form))))
(m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos)))
(d-pos (- l (length (memq 'day date-form))))
(d-pos (if (/= l d-pos) (+ 2 d-pos)))
(m-pos (- l (length (memq 'month date-form))))
(m-pos (if (/= l m-pos) (+ 2 m-pos)))
(y-pos (- l (length (memq 'year date-form))))
(y-pos (if (/= l y-pos) (+ 2 y-pos)))
(regexp
(concat
"\\(\\`\\|\^M\\|\n\\)\\("
(mapconcat 'eval date-form "\\)\\(")
"\\)"))
(case-fold-search t))
(goto-char (point-min))
(while (re-search-forward regexp nil t)
(let* ((dd-name
(if d-name-pos
(match-string-no-properties d-name-pos)))
(mm-name
(if m-name-pos
(match-string-no-properties m-name-pos)))
(mm (string-to-number
(if m-pos
(match-string-no-properties m-pos)
"")))
(dd (string-to-number
(if d-pos
(match-string-no-properties d-pos)
"")))
(y-str (if y-pos
(match-string-no-properties y-pos)))
(yy (if (not y-str)
0
(if (and (= (length y-str) 2)
abbreviated-calendar-year)
(let* ((current-y
(extract-calendar-year
(calendar-current-date)))
(y (+ (string-to-number y-str)
(* 100
(/ current-y 100)))))
(if (> (- y current-y) 50)
(- y 100)
(if (> (- current-y y) 50)
(+ y 100)
y)))
(string-to-number y-str)))))
(save-excursion
(setq entry (buffer-substring-no-properties
(point) (line-end-position))
temp (diary-pull-attrs entry file-glob-attrs)
entry (nth 0 temp)
marks (nth 1 temp)))
(if dd-name
(mark-calendar-days-named
(cdr (assoc-string
dd-name
(calendar-make-alist
calendar-day-name-array
0 nil calendar-day-abbrev-array) t)) marks)
(if mm-name
(setq mm
(if (string-equal mm-name "*") 0
(cdr (assoc-string
mm-name
(calendar-make-alist
calendar-month-name-array
1 nil calendar-month-abbrev-array) t)))))
(mark-calendar-date-pattern mm dd yy marks))))
(setq d (cdr d))))
(mark-sexp-diary-entries)
(run-hooks 'nongregorian-diary-marking-hook
'mark-diary-entries-hook)
(set-syntax-table old-diary-syntax-table)
(save-excursion
(setq mark-diary-entries-in-calendar t)
(message "Marking diary entries...")
(setq file-glob-attrs (nth 1 (diary-pull-attrs nil '())))
(with-syntax-table diary-syntax-table
(dolist (date-form diary-date-forms)
(if (eq (car date-form) 'backup)
(setq date-form (cdr date-form))) ;; ignore 'backup directive
(let* ((dayname
(diary-name-pattern calendar-day-name-array
calendar-day-abbrev-array))
(monthname
(format "%s\\|\\*"
(diary-name-pattern calendar-month-name-array
calendar-month-abbrev-array)))
(month "[0-9]+\\|\\*")
(day "[0-9]+\\|\\*")
(year "[0-9]+\\|\\*")
(l (length date-form))
(d-name-pos (- l (length (memq 'dayname date-form))))
(d-name-pos (if (/= l d-name-pos) (+ 2 d-name-pos)))
(m-name-pos (- l (length (memq 'monthname date-form))))
(m-name-pos (if (/= l m-name-pos) (+ 2 m-name-pos)))
(d-pos (- l (length (memq 'day date-form))))
(d-pos (if (/= l d-pos) (+ 2 d-pos)))
(m-pos (- l (length (memq 'month date-form))))
(m-pos (if (/= l m-pos) (+ 2 m-pos)))
(y-pos (- l (length (memq 'year date-form))))
(y-pos (if (/= l y-pos) (+ 2 y-pos)))
(regexp
(concat
"\\(\\`\\|\^M\\|\n\\)\\("
(mapconcat 'eval date-form "\\)\\(")
"\\)"))
(case-fold-search t))
(goto-char (point-min))
(while (re-search-forward regexp nil t)
(let* ((dd-name
(if d-name-pos
(match-string-no-properties d-name-pos)))
(mm-name
(if m-name-pos
(match-string-no-properties m-name-pos)))
(mm (string-to-number
(if m-pos
(match-string-no-properties m-pos)
"")))
(dd (string-to-number
(if d-pos
(match-string-no-properties d-pos)
"")))
(y-str (if y-pos
(match-string-no-properties y-pos)))
(yy (if (not y-str)
0
(if (and (= (length y-str) 2)
abbreviated-calendar-year)
(let* ((current-y
(extract-calendar-year
(calendar-current-date)))
(y (+ (string-to-number y-str)
(* 100
(/ current-y 100)))))
(if (> (- y current-y) 50)
(- y 100)
(if (> (- current-y y) 50)
(+ y 100)
y)))
(string-to-number y-str)))))
(let ((tmp (diary-pull-attrs (buffer-substring-no-properties
(point) (line-end-position))
file-glob-attrs)))
(setq entry (nth 0 tmp)
marks (nth 1 tmp)))
(if dd-name
(mark-calendar-days-named
(cdr (assoc-string
dd-name
(calendar-make-alist
calendar-day-name-array
0 nil calendar-day-abbrev-array) t)) marks)
(if mm-name
(setq mm
(if (string-equal mm-name "*") 0
(cdr (assoc-string
mm-name
(calendar-make-alist
calendar-month-name-array
1 nil calendar-month-abbrev-array) t)))))
(mark-calendar-date-pattern mm dd yy marks))))))
(mark-sexp-diary-entries)
(run-hooks 'nongregorian-diary-marking-hook
'mark-diary-entries-hook))
(message "Marking diary entries...done")))))
(defun mark-sexp-diary-entries ()

View File

@ -1532,7 +1532,7 @@ written into the buffer `*icalendar-errors*'."
(setq found-error t)
(setq error-string (format "%s\n%s\nCannot handle this event: %s"
error-val error-string e))
(message error-string))))
(message "%s" error-string))))
(if found-error
(save-current-buffer
(set-buffer (get-buffer-create "*icalendar-errors*"))

View File

@ -91,6 +91,7 @@ and type 3 is the list (HIGH LOW MICRO)."
((eq type 1) (list high low))
((eq type 2) (list high low micro))))
(autoload 'parse-time-string "parse-time")
(autoload 'timezone-make-date-arpa-standard "timezone")
;;;###autoload

View File

@ -441,7 +441,7 @@ worked today, ignoring the time worked on previous days."
"remaining" "over")
(timeclock-when-to-leave-string show-seconds today-only)))
(if (interactive-p)
(message status)
(message "%s" status)
status)))
;;;###autoload
@ -512,7 +512,7 @@ See `timeclock-relative' for more information about the meaning of
(timeclock-workday-remaining today-only)
show-seconds t)))
(if (interactive-p)
(message string)
(message "%s" string)
string)))
(defsubst timeclock-workday-elapsed ()
@ -534,7 +534,7 @@ non-nil, the amount returned will be relative to past time worked."
(let ((string (timeclock-seconds-to-string (timeclock-workday-elapsed)
show-seconds)))
(if (interactive-p)
(message string)
(message "%s" string)
string)))
(defsubst timeclock-time-to-seconds (time)
@ -579,7 +579,7 @@ relative only to the time worked today, and not to past time."
(format-time-string "%-I:%M:%S %p" then)
(format-time-string "%-I:%M %p" then))))
(if (interactive-p)
(message string)
(message "%s" string)
string)))
;;; Internal Functions:
@ -599,7 +599,7 @@ relative only to the time worked today, and not to past time."
(defun timeclock-ask-for-project ()
"Ask the user for the project they are clocking into."
(timeclock-completing-read
(format "Clock into which project (default \"%s\"): "
(format "Clock into which project (default %s): "
(or timeclock-last-project
(car timeclock-project-list)))
(mapcar 'list timeclock-project-list)

View File

@ -2056,7 +2056,11 @@ Sets mark to the value of point when this command is run."
(set-window-start (selected-window) (point))
(comint-skip-prompt))
(t
(goto-char (field-beginning pos))
(let* ((beg (field-beginning pos))
(pt (if (= (point-min) beg)
(point-min)
(1+ beg))))
(goto-char pt))
(set-window-start (selected-window) (point))))))
@ -3105,8 +3109,8 @@ When redirection is completed, the process filter is restored to
this value.")
(defvar comint-redirect-subvert-readonly nil
"Non-nil means comint-redirect can insert into otherwise-readonly buffers.
The readonly status is toggled around insertion.
"Non-nil means `comint-redirect' can insert into read-only buffers.
This works by binding `inhibit-read-only' around the insertion.
This is useful, for instance, for insertion into Help mode buffers.
You probably want to set it locally to the output buffer.")

View File

@ -1343,7 +1343,7 @@ String must be longer than `completion-prefix-min-length'."
(let* ((default (symbol-under-or-before-point))
(new-prompt
(if default
(format "%s: (default: %s) " prompt default)
(format "%s (default %s): " prompt default)
(format "%s: " prompt)))
(read (completing-read new-prompt cmpl-obarray)))
(if (zerop (length read)) (setq read (or default "")))

View File

@ -495,7 +495,7 @@ Return a list suitable for use in `interactive'."
val)
(setq val (completing-read
(if (and (symbolp v) (custom-variable-p v))
(format "Customize option: (default %s) " v)
(format "Customize option (default %s): " v)
"Customize option: ")
obarray 'custom-variable-p t))
(list (if (equal val "")
@ -670,7 +670,7 @@ If `last', order groups after non-groups."
:type 'boolean
:group 'custom-browse)
(defcustom custom-buffer-sort-alphabetically t
(defcustom custom-buffer-sort-alphabetically nil
"If non-nil, sort members of each customization group alphabetically."
:type 'boolean
:group 'custom-buffer)
@ -967,7 +967,7 @@ then prompt for the MODE to customize."
(defun customize-group (group)
"Customize GROUP, which must be a customization group."
(interactive (list (let ((completion-ignore-case t))
(completing-read "Customize group: (default emacs) "
(completing-read "Customize group (default emacs): "
obarray
(lambda (symbol)
(or (get symbol 'custom-loads)
@ -990,7 +990,7 @@ then prompt for the MODE to customize."
(defun customize-group-other-window (group)
"Customize GROUP, which must be a customization group."
(interactive (list (let ((completion-ignore-case t))
(completing-read "Customize group: (default emacs) "
(completing-read "Customize group (default emacs): "
obarray
(lambda (symbol)
(or (get symbol 'custom-loads)

View File

@ -944,7 +944,7 @@ directory DIRNAME."
desktop-buffer-file-name)))
(if desktop-missing-file-warning
(y-or-n-p (concat msg " Re-create? "))
(message msg)
(message "%s" msg)
nil)))
(let* ((auto-insert nil) ; Disable auto insertion
(coding-system-for-read
@ -1101,7 +1101,7 @@ ARGS must be an argument list for `desktop-create-buffer'."
(msg (format "Desktop lazily opening %s (%s remaining)..."
buffer-name remaining)))
(when desktop-lazy-verbose
(message msg))
(message "%s" msg))
(let ((desktop-first-buffer nil)
(desktop-buffer-ok-count 0)
(desktop-buffer-fail-count 0))

1070
lisp/dframe.el Normal file

File diff suppressed because it is too large Load Diff

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