Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
b1bb0a25
Commit
b1bb0a25
authored
Jan 24, 2010
by
Mark A. Hershberger
Browse files
merge conflict
parents
aaef4f91
8dc1adf6
Changes
42
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
199 additions
and
200 deletions
+199
-200
ChangeLog
ChangeLog
+5
-0
admin/ChangeLog
admin/ChangeLog
+5
-0
admin/notes/bugtracker
admin/notes/bugtracker
+55
-34
admin/revdiff
admin/revdiff
+0
-137
configure
configure
+2
-1
configure.in
configure.in
+1
-1
doc/emacs/ChangeLog
doc/emacs/ChangeLog
+5
-1
doc/emacs/trouble.texi
doc/emacs/trouble.texi
+1
-1
doc/misc/ChangeLog
doc/misc/ChangeLog
+5
-1
doc/misc/gnus.texi
doc/misc/gnus.texi
+1
-1
etc/NEWS
etc/NEWS
+0
-3
lisp/ChangeLog
lisp/ChangeLog
+82
-1
lisp/dired-aux.el
lisp/dired-aux.el
+1
-1
lisp/dired.el
lisp/dired.el
+2
-2
lisp/emacs-lisp/advice.el
lisp/emacs-lisp/advice.el
+1
-1
lisp/emacs-lisp/assoc.el
lisp/emacs-lisp/assoc.el
+12
-10
lisp/indent.el
lisp/indent.el
+7
-3
lisp/isearch.el
lisp/isearch.el
+4
-1
lisp/jka-compr.el
lisp/jka-compr.el
+8
-1
lisp/mail/mail-utils.el
lisp/mail/mail-utils.el
+2
-0
No files found.
ChangeLog
View file @
b1bb0a25
2010-01-23 Giorgos Keramidas <keramida@ceid.upatras.gr> (tiny change)
* configure.in: Check for utmp.h availability (FreeBSD 9.x lacks
this header file).
2010-01-12 Juanma Barranquero <lekktu@gmail.com>
* .bzrignore: Ignore all .exe, instead of individual files.
...
...
admin/ChangeLog
View file @
b1bb0a25
2010-01-20 Glenn Morris <rgm@gnu.org>
* revdiff: Remove file that only works with CVS, and isn't really
needed with Bazaar (given the in-built revision options of bzr diff).
2010-01-12 Glenn Morris <rgm@gnu.org>
* emacs-pretesters, make-announcement: Use bug-gnu-emacs rather
...
...
admin/notes/bugtracker
View file @
b1bb0a25
...
...
@@ -35,15 +35,16 @@ So you need to explicitly CC him/her (and anyone else you like).
(
Many
people
think
the
submitter
SHOULD
be
automatically
subscribed
to
subsequent
discussion
,
but
this
does
not
seem
to
be
implemented
.
See
http
://
bugs
.
debian
.
org
/
cgi
-
bin
/
bugreport
.
cgi
?
bug
=
37078
)
See
also
http
://
debbugs
.
gnu
.
org
/
5439
Do
NOT
send
a
separate
copy
to
the
bug
list
,
since
this
may
generate
a
new
report
.
The
only
time
to
send
mail
to
the
bug
list
is
to
create
a
new
report
.
Do
NOT
send
a
separate
copy
to
the
bug
list
address
,
since
this
may
generate
a
new
report
.
The
only
time
to
send
mail
to
the
bug
list
address
is
to
create
a
new
report
.
Gnus
users
can
add
the
following
to
message
-
dont
-
reply
-
to
-
names
;
similarly
with
Rmail
and
rmail
-
dont
-
reply
-
to
-
names
:
"
\\
(emacs-pretest-bug
\\
|bug-gnu-emacs
\\
)@gnu
\\
.org
\\
|\
"
\\
(emacs-pretest-bug
\\
|bug-gnu-emacs
\\
|bug-
\\
(e
\\
|gnu
\\
)macs
\\
)@gnu
\\
.org
\\
|\
\\
(submit
\\
|control
\\
|owner
\\
)@debbugs
\\
.gnu
\\
.org"
The
"owner@debbugs.gnu.org"
entry
is
there
because
it
appears
in
the
...
...
@@ -58,27 +59,23 @@ reporting.)
(
e
.
g
.
bug
-
cc
-
mode
@
gnu
.
org
),
do
NOT
just
use
a
Cc
:
header
.
Instead
,
use
"X-Debbugs-CC:"
.
This
ensures
the
Cc
address
will
get
a
mail
with
the
bug
report
number
in
.
If
you
do
not
do
this
,
each
reply
in
the
subsequent
discussion
will
end
up
creating
a
new
bug
.
This
is
annoying
.
Note
that
the
way
this
feature
works
is
perhaps
not
ideal
(
Bug
#
1720
).
If
X
-
Debbugs
-
CC
:
was
specifed
by
a
real
header
,
that
header
is
removed
in
the
mail
sent
out
to
the
bug
list
,
and
the
addresses
merged
into
the
Resent
-
CC
header
(
see
below
).
They
don
't appear as an explicit CC:
header, nor do they appear in the Reply-To: header. So people you
X-Debbugs-CC are not included in any following discussion unless they are
manually cc'
d
.
So
this
feature
really
only
serves
to
notify
them
that
a
bug
has
been
filed
.
It
's then up to them to follow any subsequent
discussion.
If X-Debbugs-CC were merged into the Reply-To header, this might work
more the way people expect.
in
the
subsequent
discussion
will
end
up
creating
a
new
bug
.
This
is
annoying
.
If
a
new
report
contains
X
-
Debbugs
-
CC
in
the
input
,
this
is
converted
to
a
real
Cc
header
in
the
output
.
(
See
Bug
#
1720
).
It
is
also
merged
into
the
Resent
-
CC
header
(
see
below
).
**
How
does
Debbugs
send
out
mails
?
The mails are sent out to the bug list with From: and To: unchanged.
Eg if you file a bug with "submit@debbugs.gnu.org", that
remains in the To: address. They reach the bug list by being resent.
The
mails
are
sent
out
to
the
bug
list
by
being
resent
.
The
From
:
header
is
unchanged
.
In
new
reports
only
(
at
present
),
the
To
:
address
is
altered
as
follows
.
Any
"bug-gnu-emacs"
,
"emacs-pretest-bug"
,
or
"submit@debbugs"
address
is
replaced
by
123
@
debbugs
in
the
mail
that
gets
sent
out
.
(
This
also
applies
to
any
Cc
:
header
,
though
you
should
be
using
X
-
Debbugs
-
CC
instead
in
new
reports
).
The
original
header
is
stored
as
X
-
Debbugs
-
Original
-
To
,
if
it
was
changed
.
Any
X
-
Debbugs
-
CC
is
merged
into
the
Cc
.
Mails
arriving
at
the
bug
list
have
the
following
Resent
-*
headers
:
...
...
@@ -88,10 +85,6 @@ Resent-CC: maintainer email address, plus any X-Debbugs-CC: entries
The
"maintainer email address"
is
"bug-gnu-emacs@gnu.org"
in
most
cases
.
A new report also has:
Mail-Followup-To: bug submitter, 123@debbugs.gnu.org
**
To
not
get
acknowledgement
mail
from
the
tracker
,
add
an
"X-Debbugs-No-Ack:"
header
(
with
any
value
).
If
you
use
Gnus
,
you
can
add
an
element
to
gnus
-
posting
-
styles
to
do
this
automatically
,
eg
:
...
...
@@ -124,10 +117,10 @@ When you close a bug, you get a message matching:
^
X
-
Emacs
-
PR
-
Message
:
closed
**
How
to
avoid
multiple
copies
of
mails
.
When
you reply to
a bug, respect the Reply-To address, ie send mail
only to the submitter address and
the numbered bug address
. Do not
send mail direct to bug-gnu-emacs or
emacs-pretest-bug unless you are
reporting a new bug.
If
you
reply
to
reports
in
the
normal
way
,
this
should
work
fine
.
Basically
,
reply
only
to
the
numbered
bug
address
(
and
any
individual
people
's addresses). Do not
send mail direct to bug-gnu-emacs or
emacs-pretest-bug unless you are
reporting a new bug.
** To close bug #123 (for example), send mail
...
...
@@ -195,8 +188,7 @@ tag:tag # all bugs with given tag
See <http://wiki.debian.org/bugs.debian.org/usertags>
"Usertags" are very similar to tags: a set of labels that can be added
to a bug. There are two differences between normal tags and user
tags:
to a bug. There are two differences between normal tags and user tags:
1) Anyone can define any valid usertag they like. In contrast, only a
limited, predefined set of normal tags are available (see above).
...
...
@@ -362,7 +354,7 @@ bug number.
Similarly, when you close a bug, it can be helpful to include the
relevant ChangeLog entry in the message to the bug tracker, so people
can see e
a
xctly what the fix was.
can see ex
a
ctly what the fix was.
*** bug-reference-mode
...
...
@@ -373,6 +365,17 @@ the bug web-pages.
http
://
lists
.
gnu
.
org
/
archive
/
html
/
emacs
-
devel
/
2009
-
11
/
msg00440
.
html
**
Bazaar
stuff
***
You
can
use
`
bzr
commit
--
fixes
emacs
:
123
' to mark that a commit fixes
Emacs bug 123. You will first need to add a line to your bazaar.conf
(untested):
bugtracker_emacs_url = http://debbugs.gnu.org/{id}
Note that all this does is add some metadata to the commit, it doesn'
t
actually
mark
the
bug
as
closed
in
the
tracker
.
**
Gnus
-
specific
voodoo
***
Put
point
on
a
bug
-
number
and
try
:
M
-
x
gnus
-
read
-
ephemeral
-
emacs
-
bug
-
group
...
...
@@ -448,7 +451,10 @@ needlessly held for moderation:
*** debbugs-submit
(quiet|control|submit)@(debbugs\.gnu\.org|emacsbugs\.donarmstrong\.com)
[0-9]+(-done|-quiet|-subscribe)?@(debbugs\.gnu\.org|emacsbugs\.donarmstrong\.com)
(bug-gnu-emacs|emacs-pretest-bug)@gnu\.org
(bug-gnu-emacs|emacs-pretest-bug|bug-(e|gnu)macs)@gnu\.org
bug-emacs and bug-gnumacs are lesser-used aliases from fencepost'
s
/
etc
/
aliases
file
.
***
emacs
-
bug
-
tracker
sender
:
bug
-
gnu
-
emacs
AT
gnu
.
org
...
...
@@ -456,3 +462,18 @@ recipient: emacs-bug-tracker AT debbugs\.gnu\.org
The
latter
is
because
that
is
the
address
that
debbugs
actually
sends
to
.
An
/
etc
/
aliases
entry
redirects
it
to
the
real
emacs
-
bug
-
tracker
address
.
**
Administrivia
The
debbugs
-
submit
list
should
have
the
administrivia
option
off
,
else
it
can
by
mistake
filter
out
requests
to
subscribe
to
bugs
.
But
,
this
feature
doesn
't work anyway (see bug#5439).
** How to test changes
Add an entry to /etc/debbugs/Maintainers like:
mytest my.email.address
Then if you do all your testing with '
Package
:
mytest
', the resulting
mails should only go to your email address.
admin/revdiff
deleted
100755 → 0
View file @
aaef4f91
#! /usr/bin/perl
# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
# 2010 Free Software Foundation, Inc.
#
# This file is part of GNU Emacs.
# GNU Emacs is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
# GNU Emacs is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
use
File::
Basename
;
if
(
@ARGV
<
3
)
{
print
<<USAGE;
revdiff FILE OLD NEW
Get a diff of FILE between revisions OLD and NEW. Store the
diff in a file named FILE-OLD-NEW.diff.
If OLD is `-' use FILE's current revision for OLD. If OLD is
`-<number>', use the Nth revision before the current one for OLD.
If NEW is +<number> or -<number>, build diffs between revisions OLD
and OLD +/- <number>.
Examples:
revdiff FILE - -1 get the latest change of FILE
revdiff FILE -1 +1 also gets the latest change of FILE
revdiff FILE 1.500 +2 get diffs 1.500-1.501 and 1.501-1.502.
USAGE
exit
1
;
}
$file
=
shift
@ARGV
;
$old
=
shift
@ARGV
;
sub
diffit
{
my
(
$old
,
$new
)
=
@_
;
print
"
cvs diff -r
$old
-r
$new
$file
>
$file
-
$old
-
$new
.diff
\n
";
system
"
cvs diff -r
$old
-r
$new
$file
>
$file
-
$old
-
$new
.diff
";
}
sub
current_revision
($)
{
my
(
$file
)
=
@_
;
my
$dir
=
dirname
(
$file
);
my
$base
=
basename
(
$file
);
my
$entries
=
"
$dir
/CVS/Entries
";
die
"
Can't find
$entries
"
unless
-
f
$entries
;
open
(
IN
,
"
<
$entries
")
or
die
"
Cannot open
$entries
";
my
$rev
;
while
(
$line
=
<
IN
>
)
{
if
(
$line
=~
m,/$base/([^/]+),
)
{
$rev
=
$
1
;
break
;
}
}
die
"
Cannot determine current revision of
$file
"
unless
$rev
;
close
(
IN
);
return
$rev
;
}
if
(
$old
eq
"
-
")
{
$old
=
current_revision
(
$file
);
}
elsif
(
$old
=~
/^-(\d+)$/
)
{
my
$offset
=
$
1
;
$old
=
current_revision
(
$file
);
die
"
Internal error
"
unless
$old
=~
/(.*)\.(\d+)$/
;
my
$minor
=
$
2
-
$offset
;
$old
=
sprintf
("
%d.%d
",
$
1
,
$minor
);
}
while
(
@ARGV
)
{
my
$new
=
shift
@ARGV
;
if
(
$new
=~
/^[+]\d+$/
)
{
my
$n
=
$new
;
for
(
$i
=
0
;
$i
<
$n
;
++
$i
)
{
unless
(
$old
=~
/(.*)\.(\d+)$/
)
{
die
"
Internal error
";
}
my
$j
=
$
2
+
1
;
$new
=
"
$1.
$j
";
diffit
(
$old
,
$new
);
$old
=
$new
;
}
}
elsif
(
$new
=~
/^[-]\d+$/
)
{
my
$n
=
-
$new
;
for
(
$i
=
0
;
$i
<
$n
;
++
$i
)
{
unless
(
$old
=~
/(.*)\.(\d+)$/
)
{
die
"
Internal error
";
}
my
$j
=
$
2
-
1
;
$new
=
"
$1.
$j
";
diffit
(
$new
,
$old
);
$old
=
$new
;
}
}
else
{
diffit
(
$old
,
$new
);
$old
=
$new
;
}
}
# Local Variables:
# mode: cperl
# End:
# arch-tag: 2798b20d-c7f2-4c78-8378-7bb529c36a09
configure
View file @
b1bb0a25
...
...
@@ -6663,13 +6663,14 @@ fi
for ac_header in sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
sys/utsname.h pwd.h
sys/utsname.h pwd.h
utmp.h
do
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
...
...
configure.in
View file @
b1bb0a25
...
...
@@ -1106,7 +1106,7 @@ AC_CHECK_HEADERS(sys/select.h sys/timeb.h sys/time.h unistd.h utime.h \
linux/version.h sys/systeminfo.h termios.h limits.h string.h stdlib.h \
termcap.h stdio_ext.h fcntl.h strings.h coff.h pty.h sys/mman.h \
sys/param.h sys/vlimit.h sys/resource.h locale.h sys/_mbstate_t.h \
sys/utsname.h pwd.h)
sys/utsname.h pwd.h
utmp.h
)
AC_MSG_CHECKING(if personality LINUX32 can be set)
AC_TRY_COMPILE([#include <sys/personality.h>], [personality (PER_LINUX32)],
...
...
doc/emacs/ChangeLog
View file @
b1bb0a25
2010-01-
19
Mark A. Hershberger <mah@everybody.org>
2010-01-
24
Mark A. Hershberger <mah@everybody.org>
* programs.texi (Other C Commands): Replace reference to obsolete
c-subword-mode.
2010-01-21 Glenn Morris <rgm@gnu.org>
* trouble.texi (Bugs): Fix PROBLEMS keybinding.
2010-01-12 Glenn Morris <rgm@gnu.org>
* trouble.texi (Checklist): Use bug-gnu-emacs rather than
...
...
doc/emacs/trouble.texi
View file @
b1bb0a25
...
...
@@ -419,7 +419,7 @@ to do so effectively, you must know when and how to do it.
Before reporting a bug, it is a good idea to see if it is already
known. You can find the list of known problems in the file
@file{etc/PROBLEMS} in the Emacs distribution; type @kbd{C-h C-
e
} to read
@file{etc/PROBLEMS} in the Emacs distribution; type @kbd{C-h C-
p
} to read
it. Some additional user-level problems can be found in @ref{Bugs and
problems, , Bugs and problems, efaq, GNU Emacs FAQ}. Looking up your
problem in these two documents might provide you with a solution or a
...
...
doc/misc/ChangeLog
View file @
b1bb0a25
2010-01-19 Mark A. Hershberger <mah@everybody.org>
2010-01-24 Mark A. Hershberger <mah@everybody.org>
* gnus.texi (Score File Format): Fix typo.
2010-01-21 Katsumi Yamaoka <yamaoka@jpl.org>
* cc-mode.texi: Replace references to obsolete c-subword-mode.
...
...
doc/misc/gnus.texi
View file @
b1bb0a25
...
...
@@ -21803,7 +21803,7 @@ not be loaded, even though they would normally be so, for some reason or
other.
@item eval
The value of this entry will be @code{eval}e
l
. This element will be
The value of this entry will be @code{eval}e
d
. This element will be
ignored when handling global score files.
@item read-only
etc/NEWS
View file @
b1bb0a25
...
...
@@ -322,9 +322,6 @@ backends do not support this.
**** The short log format for git makes use of the graph display, so
it's not supported on git versions earlier than 1.5.
**** The new variable vc-git-add-signoff can be used to add a
Signed-off-by line when committing.
**** Support for operating with stashes has been added to vc-dir: the stash list is
displayed in the *vc-dir* header, stashes can be created, removed, applied and
their content displayed.
...
...
lisp/ChangeLog
View file @
b1bb0a25
2010-01-
19
Mark A. Hershberger <mah@everybody.org>
2010-01-
24
Mark A. Hershberger <mah@everybody.org>
* progmodes/python.el: Replace reference to obsolete c-subward-mode.
2010-01-24 Dan Nicolaescu <dann@ics.uci.edu>
Remove support for adding --signoff on commit.
Future support will use an incompatible generic mechanism.
* vc-git.el (vc-git-add-signoff): Remove variable.
(vc-git-toggle-signoff): Remove function.
(vc-git-extra-menu-map): Do not bind vc-git-toggle-signoff.
* term/xterm.el (xterm-maybe-set-dark-background-mode): Rename
from xterm-set-background-mode. Return t if the background mode
was set.
(terminal-init-xterm): Move tty-set-up-initial-frame-faces
earlier, call it again in case the background mode has changed.
2010-01-23 Dmitri Paduchikh <dpaduch@k66.ru> (tiny change)
* emacs-lisp/advice.el (ad-set-orig-definition): Fix typo
(Bug#3541).
2010-01-23 Chong Yidong <cyd@stupidchicken.com>
* emacs-lisp/assoc.el (aelement): Doc fix.
(aput, adelete, amake): Use lexical-let (Bug#5450).
2010-01-23 Stephen Leake <stephen_leake@member.fsf.org>
* progmodes/ada-mode.el (ada-in-paramlist-p): Pragma syntax
is the same as subprogram call, not declaration. (Bug#5435).
2010-01-23 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-smb.el (tramp-smb-conf): New defcustom.
(tramp-smb-maybe-open-connection): Use it.
2010-01-22 Michael Albinus <michael.albinus@gmx.de>
* net/tramp-imap.el (top): Autoload needed packages. (Bug#5448)
2010-01-22 Stefan Monnier <monnier@iro.umontreal.ca>
* mail/rmailmm.el (rmail-mime-handle): Don't set the buffer to unibyte
just because we see "encoding: 8bit".
* mail/rmail.el (rmail-show-message-1): Decode the body's QP into bytes.
2010-01-22 Chong Yidong <cyd@stupidchicken.com>
* isearch.el (isearch-allow-scroll): Doc fix (Bug#5446).
2010-01-22 Eli Zaretskii <eliz@gnu.org>
* jka-compr.el (jka-compr-load): If load-file is not in
load-history, try its file-truename version. (bug#5447)
2010-01-21 Alan Mackenzie <acm@muc.de>
Fix a situation where deletion of a cpp construct throws an error.
* progmodes/cc-engine.el (c-invalidate-state-cache): Before
invoking c-with-all-but-one-cpps-commented-out, check that the
special cpp construct is still in the buffer.
(c-parse-state): Record the special cpp with markers, not numbers.
2010-01-21 Kenichi Handa <handa@m17n.org>
* textmodes/sgml-mode.el (sgml-maybe-name-self): No need to
process last-command-event, as it is now decoded first (Bug#5380).
2010-01-20 Chong Yidong <cyd@stupidchicken.com>
* term.el (term-send-raw-meta): Revert 2009-12-04 change (Bug#5330).
2010-01-20 Glenn Morris <rgm@gnu.org>
* indent.el (tab-always-indent): Fix custom-type.
2010-01-19 Alan Mackenzie <acm@muc.de>
* progmodes/cc-defs.el: Fix bug#5395: typing '#' in an empty
buffer throws "args out of range".
(c-set-cpp-delimiters, c-clear-cpp-delimiters): Check for EOB
playing the role of delimiter.
2010-01-18 Stephen Leake <stephen_leake@member.fsf.org>
* lisp/progmodes/ada-mode.el: Fix bug#5400.
...
...
lisp/dired-aux.el
View file @
b1bb0a25
...
...
@@ -2308,7 +2308,7 @@ Use \\[dired-hide-all] to (un)hide all directories."
(restore-buffer-modified-p modflag)))
;;;###autoload
(defun dired-hide-all (
arg
)
(defun dired-hide-all (
&optional ignored
)
"
Hide
all
subdirectories,
leaving
only
their
header
lines.
If
there
is
already
something
hidden,
make
everything
visible
again.
Use
\\[dired-hide-subdir]
to
(
un
)
hide
a
particular
subdirectory.
"
...
...
lisp/dired.el
View file @
b1bb0a25
...
...
@@ -3517,7 +3517,7 @@ Ask means pop up a menu for the user to select one of copy, move or link."
;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command
;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown
;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff
;;;;;; dired-diff) "
dired-aux
" "
dired-aux.el
" "
557aca1f6e86b39f1c7612ee123d5354
")
;;;;;; dired-diff) "
dired-aux
" "
dired-aux.el
" "
07676ea25af17f5d50cc5db4f53bddc0
")
;;; Generated autoloads from dired-aux.el
(autoload 'dired-diff "
dired-aux
" "
\
...
...
@@ -3917,7 +3917,7 @@ Hide all subdirectories, leaving only their header lines.
If
there
is
already
something
hidden,
make
everything
visible
again.
Use
\\[dired-hide-subdir]
to
(
un
)
hide
a
particular
subdirectory.
\(fn
ARG
)
" t nil)
\(fn
&optional
IGNORED
)
" t nil)
(autoload 'dired-isearch-filenames-setup "
dired-aux
" "
\
Set
up
isearch
to
search
in
Dired
file
names.
...
...
lisp/emacs-lisp/advice.el
View file @
b1bb0a25
...
...
@@ -2191,7 +2191,7 @@ Redefining advices affect the construction of an advised definition."
(
defmacro
ad-set-orig-definition
(
function
definition
)
`
(
ad-safe-fset
(
ad-get-advice-info-field
function
'origname
)
,
definition
))
(
ad-get-advice-info-field
,
function
'origname
)
,
definition
))
(
defmacro
ad-clear-orig-definition
(
function
)
`
(
fmakunbound
(
ad-get-advice-info-field
,
function
'origname
)))
...
...
lisp/emacs-lisp/assoc.el
View file @
b1bb0a25
;;; assoc.el --- insert/delete/sort functions on association lists
;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
;;
2006, 2007, 2008,
2009, 2010 Free Software Foundation, Inc.
;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
2006, 2007, 2008,
;; 2009, 2010
Free Software Foundation, Inc.
;; Author: Barry A. Warsaw <bwarsaw@cen.com>
;; Keywords: extensions
...
...
@@ -27,6 +27,7 @@
;; fetching off key-value pairs in association lists.
;;; Code:
(
eval-when-compile
(
require
'cl
))
(
defun
asort
(
alist-symbol
key
)
"Move a specified key-value pair to the head of an alist.
...
...
@@ -41,7 +42,8 @@ sorted list."
(
defun
aelement
(
key
value
)
"Make a list of a cons cell containing car of KEY and cdr of VALUE.
The returned list is suitable as an element of an alist."
The returned list is suitable for concatenating with an existing
alist, via `nconc'."
(
list
(
cons
key
value
)))
...
...
@@ -71,8 +73,8 @@ If VALUE is not supplied, or is nil, the key-value pair will not be
modified, but will be moved to the head of the alist. If the key-value
pair cannot be found in the alist, it will be inserted into the head
of the alist (with value nil if VALUE is nil or not supplied)."
(
let
((
elem
(
aelement
key
value
))
alist
)
(
lexical-
let
((
elem
(
aelement
key
value
))
alist
)
(
asort
alist-symbol
key
)
(
setq
alist
(
eval
alist-symbol
))
(
cond
((
null
alist
)
(
set
alist-symbol
elem
))
...
...
@@ -86,7 +88,7 @@ of the alist (with value nil if VALUE is nil or not supplied)."
Alist is referenced by ALIST-SYMBOL and the key-value pair to remove
is pair matching KEY. Returns the altered alist."
(
asort
alist-symbol
key
)
(
let
((
alist
(
eval
alist-symbol
)))
(
lexical-
let
((
alist
(
eval
alist-symbol
)))
(
cond
((
null
alist
)
nil
)
((
anot-head-p
alist
key
)
alist
)
(
t
(
set
alist-symbol
(
cdr
alist
))))))
...
...
@@ -123,10 +125,10 @@ KEYLIST and VALUELIST should have the same number of elements, but
this isn't enforced. If VALUELIST is smaller than KEYLIST, remaining
keys are associated with nil. If VALUELIST is larger than KEYLIST,
extra values are ignored. Returns the created alist."
(
let
((
keycar
(
car
keylist
))
(
keycdr
(
cdr
keylist
))
(
valcar
(
car
valuelist
))
(
valcdr
(
cdr
valuelist
)))
(
lexical-
let
((
keycar
(
car
keylist
))
(
keycdr
(
cdr
keylist
))
(
valcar
(
car
valuelist
))
(
valcdr
(
cdr
valuelist
)))
(
cond
((
null
keycdr
)
(
aput
alist-symbol
keycar
valcar
))
(
t
...
...
lisp/indent.el
View file @
b1bb0a25
;;; indent.el --- indentation commands for Emacs
;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
;;
2005, 2006, 2007,
2008, 2009, 2010 Free Software Foundation, Inc.
;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
2005, 2006, 2007,
;; 2008, 2009, 2010
Free Software Foundation, Inc.
;; Maintainer: FSF
...
...
@@ -55,7 +55,11 @@ was already indented, then try to complete the thing at point.
Some programming language modes have their own variable to control this,
e.g., `c-tab-always-indent', and do not respect this variable."
:group
'indent
:type
'
(
choice
(
const
nil
)
(
const
t
)
(
const
always
)))
:type
'
(
choice
(
const
:tag
"Always indent"
t
)
(
const
:tag
"Indent if inside indentation, else TAB"
nil
)
(
const
:tag
"Indent, or if already indented complete"
complete
)))
(
defun
indent-according-to-mode
()
"Indent line in proper way for current major mode.
...
...
lisp/isearch.el
View file @
b1bb0a25
...
...
@@ -1754,7 +1754,10 @@ Scroll-bar or mode-line events are processed appropriately."
(put 'digit-argument 'isearch-scroll t)
(defcustom isearch-allow-scroll nil
"If non-nil, scrolling commands are allowed during incremental search."
"Whether scrolling is allowed during incremental search.
If non-nil, scrolling commands can be used in Isearch mode.
However, the current match will never scroll offscreen.
If nil, scolling commands will first cancel Isearch mode."
:type 'boolean
:group 'isearch)
...
...
lisp/jka-compr.el
View file @
b1bb0a25
...
...
@@ -590,7 +590,14 @@ There should be no more than seven characters after the final `/'."
(
or
nomessage
(
message
"Loading %s...done."
file
))
;; Fix up the load history to point at the right library.
(
let
((
l
(
assoc
load-file
load-history
)))
(
let
((
l
(
or
(
assoc
load-file
load-history
)
;; On MS-Windows, if load-file is in
;; temporary-file-directory, it will look like
;; "c:/DOCUME~1/USER/LOCALS~1/foo", whereas
;; readevalloop will record its truename in