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
b0126eac
Commit
b0126eac
authored
Aug 22, 2010
by
Chong Yidong
Browse files
Merge changes from emacs-23 branch.
parents
b613941b
bc7d7ea6
Changes
29
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
210 additions
and
86 deletions
+210
-86
doc/emacs/ChangeLog
doc/emacs/ChangeLog
+4
-0
doc/emacs/misc.texi
doc/emacs/misc.texi
+9
-0
doc/lispref/ChangeLog
doc/lispref/ChangeLog
+8
-0
doc/lispref/modes.texi
doc/lispref/modes.texi
+9
-3
doc/lispref/objects.texi
doc/lispref/objects.texi
+2
-2
leim/ChangeLog
leim/ChangeLog
+23
-0
leim/quail/arabic.el
leim/quail/arabic.el
+2
-2
leim/quail/georgian.el
leim/quail/georgian.el
+5
-5
leim/quail/greek.el
leim/quail/greek.el
+9
-2
leim/quail/latin-ltx.el
leim/quail/latin-ltx.el
+2
-2
leim/quail/vntelex.el
leim/quail/vntelex.el
+1
-1
lisp/ChangeLog
lisp/ChangeLog
+72
-1
lisp/align.el
lisp/align.el
+4
-2
lisp/calendar/diary-lib.el
lisp/calendar/diary-lib.el
+2
-2
lisp/emacs-lisp/easy-mmode.el
lisp/emacs-lisp/easy-mmode.el
+14
-16
lisp/files.el
lisp/files.el
+1
-0
lisp/ido.el
lisp/ido.el
+26
-39
lisp/iswitchb.el
lisp/iswitchb.el
+6
-4
lisp/mail/rmail.el
lisp/mail/rmail.el
+8
-5
lisp/menu-bar.el
lisp/menu-bar.el
+3
-0
No files found.
doc/emacs/ChangeLog
View file @
b0126eac
2010-08-21 Glenn Morris <rgm@gnu.org>
* misc.texi (Amusements): Mention bubbles and animate.
2010-07-31 Eli Zaretskii <eliz@gnu.org>
* files.texi (Visiting): Add more index entries for
...
...
doc/emacs/misc.texi
View file @
b0126eac
...
...
@@ -2784,6 +2784,10 @@ bored, try an argument of 9. Sit back and watch.
If you want a little more personal involvement, try @kbd{M-x gomoku},
which plays the game Go Moku with you.
@findex bubbles
@kbd{M-x bubbles} is a game in which the object is to remove as many
bubbles as you can in the smallest number of moves.
@findex blackbox
@findex mpuz
@findex 5x5
...
...
@@ -2832,6 +2836,11 @@ bats.
@kbd{M-x solitaire} plays a game of solitaire in which you jump pegs
across other pegs.
@findex animate-birthday-present
@cindex animate
The @code{animate} package makes text dance. For an example, try
@kbd{M-x animate-birthday-present}.
@findex studlify-region
@cindex StudlyCaps
@kbd{M-x studlify-region} studlify-cases the region, producing
...
...
doc/lispref/ChangeLog
View file @
b0126eac
2010
-
08
-
22
Chong
Yidong
<
cyd
@
stupidchicken
.
com
>
*
modes
.
texi
(
Defining
Minor
Modes
):
Doc
fix
(
Bug
#
6880
).
2010
-
08
-
22
Chong
Yidong
<
cyd
@
stupidchicken
.
com
>
*
objects
.
texi
(
Bool
-
Vector
Type
):
Minor
definition
tweak
(
Bug
#
6878
).
2010
-
08
-
20
Eli
Zaretskii
<
eliz
@
gnu
.
org
>
*
commands
.
texi
(
Misc
Events
):
Add
cross
-
references
to
where
...
...
doc/lispref/modes.texi
View file @
b0126eac
...
...
@@ -1411,14 +1411,20 @@ The string @var{lighter} says what to display in the mode line
when the mode is enabled; if it is @code{nil}, the mode is not displayed
in the mode line.
The optional argument @var{keymap} specifies the keymap for the minor
mode.
It can
be a variable name
,
whose value is
the keymap, or it can be an alist
specifying bindings in
th
is
form
:
The optional argument @var{keymap} specifies the keymap for the minor
mode. If non-@code{nil}, it should
be a variable name
(
whose value is
a keymap), a keymap, or an alist of
th
e
form
@example
(@var{key-sequence} . @var{definition})
@end example
@noindent
where each @var{key-sequence} and @var{definition} are arguments
suitable for passing to @code{define-key} (@pxref{Changing Key
Bindings}). If @var{keymap} is a keymap or an alist, this also
defines the variable @code{@var{mode}-map}.
The above three arguments @var{init-value}, @var{lighter}, and
@var{keymap} can be (partially) omitted when @var{keyword-args} are
used. The @var{keyword-args} consist of keywords followed by
...
...
doc/lispref/objects.texi
View file @
b0126eac
...
...
@@ -1189,8 +1189,8 @@ Syntax tables (@pxref{Syntax Tables}).
@node Bool-Vector Type
@subsection Bool-Vector Type
A @dfn{bool-vector} is a one-dimensional array
of
elements
tha
t
must
be @code{t} or @code{nil}.
A @dfn{bool-vector} is a one-dimensional array
whose
elements
mus
t
be @code{t} or @code{nil}.
The printed representation of a bool-vector is like a string, except
that it begins with @samp{#&} followed by the length. The string
...
...
leim/ChangeLog
View file @
b0126eac
2010
-
08
-
15
Andreas
Schwab
<
schwab
@
linux
-
m68k
.
org
>
*
quail
/
vntelex
.
el
(
"vietnamese-telex"
):
Doc
fix
.
*
quail
/
georgian
.
el
:
Remove
extra
backslashes
.
2010
-
08
-
14
Andreas
Schwab
<
schwab
@
linux
-
m68k
.
org
>
*
quail
/
arabic
.
el
:
Quote
[
and
].
*
quail
/
latin
-
ltx
.
el
:
Likewise
.
*
quail
/
greek
.
el
(
"greek"
,
"greek-postfix"
):
Change
string
to
character
.
2010
-
08
-
13
Kenichi
Handa
<
handa
@
m17n
.
org
>
*
quail
/
greek
.
el
(
"greek-postfix"
):
Add
rules
for
Greek
style
quotes
.
2010
-
08
-
09
Kenichi
Handa
<
handa
@
m17n
.
org
>
*
quail
/
greek
.
el
(
"greek"
):
Add
rules
for
Greek
style
quotes
.
2010
-
05
-
15
Glenn
Morris
<
rgm
@
gnu
.
org
>
*
Makefile
.
in
(
install
):
Remove
references
to
CVS
-
related
files
.
...
...
leim/quail/arabic.el
View file @
b0126eac
...
...
@@ -57,8 +57,8 @@ Based on Arabic table in X Keyboard Configuration DB.
(
"A"
?
ِ
)
(
"S"
?
ٍ
)
(
"D"
?]
)
(
"F"
?[
)
(
"D"
?
\
]
)
(
"F"
?
\
[
)
(
"G"
[
"لأ"
]
)
(
"H"
?
أ
)
(
"J"
?
ـ
)
...
...
leim/quail/georgian.el
View file @
b0126eac
...
...
@@ -51,7 +51,7 @@
(
"n"
?
ნ
)
(
"o"
?
ო
)
(
".p"
?
პ
)
(
"
\
+z"
?
ჟ
)
(
"+z"
?
ჟ
)
(
"r"
?
რ
)
(
"s"
?
ს
)
(
".t"
?
ტ
)
...
...
@@ -60,14 +60,14 @@
(
"k"
?
ქ
)
(
".g"
?
ღ
)
(
"q"
?
ყ
)
(
"
\
+s"
?
შ
)
(
"
\
+c"
?
ჩ
)
(
"+s"
?
შ
)
(
"+c"
?
ჩ
)
(
"c"
?
ც
)
(
"j"
?
ძ
)
(
".c"
?
წ
)
(
".
\
+c"
?
ჭ
)
(
".+c"
?
ჭ
)
(
"x"
?
ხ
)
(
"
\
+j"
?
ჯ
)
(
"+j"
?
ჯ
)
(
"h"
?
ჰ
)
(
"q1"
?
ჴ
)
(
"e0"
?
ჱ
)
...
...
leim/quail/greek.el
View file @
b0126eac
...
...
@@ -1279,7 +1279,9 @@ e.g.
(
";:i"
?
,
F@
(
B
)
(
":;i"
?
,
F@
(
B
)
(
";:y"
?
,
F
`
(
B
)
(
":;y"
?
,
F
`
(
B
))
(
":;y"
?
,
F
`
(
B
)
(
";<"
?
$
(
Q
)(
(
B
)
(
";>"
?
$
(
Q
)
2
(
B
))
(
quail-define-package
"greek-postfix"
"GreekPost"
",FX(B"
nil
...
...
@@ -1419,7 +1421,12 @@ e.g.
(
"i:;"
?
,
F@
(
B
)
(
"i;:"
?
,
F@
(
B
)
(
"y:;"
?
,
F
`
(
B
)
(
"y;:"
?
,
F
`
(
B
))
(
"y;:"
?
,
F
`
(
B
)
;; These two are asymmetric with ";<" and ";>" in "greek" input
;; method. But, as the other Latin postfix methods adopt "<<" and
;; ">>", it may be better to follow them.
(
"<<"
?
$
(
Q
)(
(
B
)
(
">>"
?
$
(
Q
)
2
(
B
))
;; arch-tag: 2a37e042-db1b-4ecf-b755-117775a3c150
...
...
leim/quail/latin-ltx.el
View file @
b0126eac
...
...
@@ -653,7 +653,7 @@ system, including many technical ones. Examples:
(
"\\lambda"
?
λ
)
(
"\\langle"
?
〈
)
(
"\\lbrace"
?{
)
(
"\\lbrack"
?[
)
(
"\\lbrack"
?
\
[
)
(
"\\lceil"
?
⌈
)
(
"\\ldots"
?
…
)
(
"\\le"
?
≤
)
...
...
@@ -788,7 +788,7 @@ system, including many technical ones. Examples:
(
"\\quad"
?
)
(
"\\rangle"
?
〉
)
(
"\\rbrace"
?}
)
(
"\\rbrack"
?]
)
(
"\\rbrack"
?
\
]
)
(
"\\rceil"
?
⌉
)
(
"\\rfloor"
?
⌋
)
(
"\\rightarrow"
?
→
)
...
...
leim/quail/vntelex.el
View file @
b0126eac
...
...
@@ -53,7 +53,7 @@ Other diacritics:
acute s as -> ,1a(B
grave f af -> ,1`(B
hook above r ar -> ,1d(B
tilde x ax
-> ,1c(B
tilde x ax -> ,1c(B
dot below j aj -> ,1U(B
d bar dd -> ,1p(B
...
...
lisp/ChangeLog
View file @
b0126eac
2010-08-22 Chong Yidong <cyd@stupidchicken.com>
* emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix (Bug#6880).
2010-08-22 Leo <sdl.web@gmail.com>
Fix buffer-list rename&refresh after after killing a buffer in ido.
* lisp/ido.el: Revert Óscar's.
(ido-kill-buffer-at-head): Exit the minibuffer with ido-exit=refresh.
Remember the buffers at head, rather than their name.
* lisp/iswitchb.el (iswitchb-kill-buffer): Re-make the list.
2010-08-22 Kirk Kelsey <kirk.kelsey@0x4b.net> (tiny change)
Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/make-mode.el (makefile-fill-paragraph): Account for the
extra backslash added to each line (bug#6890).
2010-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
* subr.el (read-key): Don't echo keystrokes (bug#6883).
2010-08-22 Glenn Morris <rgm@gnu.org>
* menu-bar.el (menu-bar-games-menu): Add landmark.
2010-08-22 Glenn Morris <rgm@gnu.org>
* align.el (align-regexp): Make group and spacing arguments
use the interactive defaults when non-interactive. (Bug#6698)
* mail/rmail.el (rmail-forward): Replace mail-text-start with its
expansion, so as not to need sendmail.
(mail-text-start): Remove declaration.
(rmail-retry-failure): Require sendmail.
2010-08-22 Chong Yidong <cyd@stupidchicken.com>
* subr.el (read-key): Don't hide the menu-bar entries (bug#6881).
2010-08-22 Michael Albinus <michael.albinus@gmx.de>
* progmodes/flymake.el (flymake-start-syntax-check-process):
Use `start-file-process' in order to let it run also on remote hosts.
2010-08-22 Kenichi Handa <handa@m17n.org>
* files.el: Add `word-wrap' as safe local variable.
2010-08-22 Glenn Morris <rgm@gnu.org>
* woman.el (woman-translate): Case matters. (Bug#6849)
2010-08-22 Chong Yidong <cyd@stupidchicken.com>
* simple.el (kill-region): Doc fix (Bug#6787).
2010-08-22 Glenn Morris <rgm@gnu.org>
* calendar/diary-lib.el (diary-header-line-format):
Fit it to the window, not the frame.
2010-08-22 Andreas Schwab <schwab@linux-m68k.org>
* subr.el (ignore-errors): Add debug declaration.
2010-08-22 Geoff Gole <geoffgole@gmail.com> (tiny change)
* whitespace.el (whitespace-color-off): Remove post-command-hook
locally.
2010-08-21 Stefan Monnier <monnier@iro.umontreal.ca>
* vc/add-log.el (add-log-file-name): Don't get confused by symlinks.
...
...
@@ -346,7 +417,7 @@
(ctext-standard-encodings): New variable.
(ctext-non-standard-encodings-table): List only elements for
non-standard encodings.
(ctext-pre-write-conversion): Adjust
ed
for the above change.
(ctext-pre-write-conversion): Adjust for the above change.
Check ctext-standard-encodings.
* international/mule-conf.el (compound-text): Doc fix.
...
...
lisp/align.el
View file @
b0126eac
;;; align.el --- align text to a specific column, by regexp
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
;;
2005, 2006, 2007,
2008, 2009, 2010 Free Software Foundation, Inc.
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007,
;; 2008, 2009, 2010
Free Software Foundation, Inc.
;; Author: John Wiegley <johnw@gnu.org>
;; Maintainer: FSF
...
...
@@ -944,6 +944,8 @@ region, call `align-regexp' and type in that regular expression."
(
list
(
concat
"\\(\\s-*\\)"
(
read-string
"Align regexp: "
))
1
align-default-spacing
nil
))))
(
or
group
(
setq
group
1
))
(
or
spacing
(
setq
spacing
align-default-spacing
))
(
let
((
rule
(
list
(
list
nil
(
cons
'regexp
regexp
)
(
cons
'group
(
abs
group
))
...
...
lisp/calendar/diary-lib.el
View file @
b0126eac
...
...
@@ -383,14 +383,14 @@ The format of the header is specified by `diary-header-line-format'."
"
Some
text
is
hidden
-
press
\"s\"
in
calendar
\
before
edit/copy
"
"
Diary
"))
?\s (
frame
-width)))
?\s (
window
-width)))
"
Format
of
the
header
line
displayed
by
`
diary-simple-display
'.
Only
used
if
`
diary-header-line-flag
'
is
non-nil.
"
:group 'diary
:type 'sexp
:initialize 'custom-initialize-default
:set 'diary-set-header
:version "
2
2.1
")
:version "
2
3.3
") ; frame-width -> window-width
;; The first version of this also checked for diary-selective-display
;; in the non-fancy case. This was an attempt to distinguish between
...
...
lisp/emacs-lisp/easy-mmode.el
View file @
b0126eac
...
...
@@ -86,25 +86,23 @@ replacing its case-insensitive matches with the literal string in LIGHTER."
;;;###autoload
(
defmacro
define-minor-mode
(
mode
doc
&optional
init-value
lighter
keymap
&rest
body
)
"Define a new minor mode MODE.
This function defines the associated control variable MODE, keymap MODE-map,
and toggle command MODE.
This defines the control variable MODE and the toggle command MODE.
DOC is the documentation for the mode toggle command.
Optional INIT-VALUE is the initial value of the mode's variable.
Optional LIGHTER is displayed in the modeline when the mode is on.
Optional KEYMAP is the default (defvar) keymap bound to the mode keymap.
If it is a list, it is passed to `easy-mmode-define-keymap'
in order to build a valid keymap. It's generally better to use
a separate MODE-map variable than to use this argument.
The above three arguments can be skipped if keyword arguments are
used (see below).
BODY contains code to execute each time the mode is activated or deactivated.
It is executed after toggling the mode,
and before running the hook variable `MODE-hook'.
Before the actual body code, you can write keyword arguments (alternating
keywords and values). These following keyword arguments are supported (other
keywords will be passed to `defcustom' if the minor mode is global):
Optional KEYMAP is the default keymap bound to the mode keymap.
If non-nil, it should be a variable name (whose value is a keymap),
a keymap, or a list of arguments for `easy-mmode-define-keymap'.
If KEYMAP is a keymap or list, this also defines the variable MODE-map.
BODY contains code to execute each time the mode is enabled or disabled.
It is executed after toggling the mode, and before running MODE-hook.
Before the actual body code, you can write keyword arguments, i.e.
alternating keywords and values. These following special keywords
are supported (other keywords are passed to `defcustom' if the minor
mode is global):
:group GROUP Custom group name to use in all generated `defcustom' forms.
Defaults to MODE without the possible trailing \"-mode\".
Don't use this default group name unless you have written a
...
...
lisp/files.el
View file @
b0126eac
...
...
@@ -2805,6 +2805,7 @@ asking you for confirmation."
(no-update-autoloads . booleanp)
(tab-width . integerp) ;; C source code
(truncate-lines . booleanp) ;; C source code
(word-wrap . booleanp) ;; C source code
(bidi-display-reordering . booleanp))) ;; C source code
(put 'bidi-paragraph-direction 'safe-local-variable
...
...
lisp/ido.el
View file @
b0126eac
...
...
@@ -1070,11 +1070,11 @@ Only used if `ido-use-virtual-buffers' is non-nil.")
;; Stores the current list of items that will be searched through.
;; The list is ordered, so that the most interesting item comes first,
;; although by default, the files visible in the current frame are put
;; at the end of the list.
(
defvar
ido-cur-list
nil
)
;; at the end of the list.
Created by `ido-make-item-list'.
(
defvar
ido-cur-list
)
;; Stores the choice list for ido-completing-read
(
defvar
ido-choice-list
nil
)
(
defvar
ido-choice-list
)
;; Stores the list of items which are ignored when building
;; `ido-cur-list'. It is in no specific order.
...
...
@@ -3400,11 +3400,9 @@ for first matching file."
(
if
ido-temp-list
(
nconc
ido-temp-list
ido-current-buffers
)
(
setq
ido-temp-list
ido-current-buffers
))
(
when
(
and
default
(
buffer-live-p
(
get-buffer
default
)))
(
setq
ido-temp-list
(
cons
default
(
delete
default
ido-temp-list
))))
(
if
ido-use-virtual-buffers
(
ido-add-virtual-buffers-to-list
))
(
if
default
(
setq
ido-temp-list
(
cons
default
(
delete
default
ido-temp-list
))))
(
run-hooks
'ido-make-buffer-list-hook
)
ido-temp-list
))
...
...
@@ -3672,7 +3670,6 @@ This is to make them appear as if they were \"virtual buffers\"."
;; Used by `ido-get-buffers-in-frames' to walk through all windows
(
let
((
buf
(
buffer-name
(
window-buffer
win
))))
(
unless
(
or
(
member
buf
ido-bufs-in-frame
)
(
minibufferp
buf
)
(
member
buf
ido-ignore-item-temp-list
))
;; Only add buf if it is not already in list.
;; This prevents same buf in two different windows being
...
...
@@ -3913,27 +3910,6 @@ This is to make them appear as if they were \"virtual buffers\"."
;;(add-hook 'completion-setup-hook 'completion-setup-function)
(
display-completion-list
completion-list
)))))))
(
defun
ido-kill-buffer-internal
(
buf
)
"Kill buffer BUF and rebuild ido's buffer list if needed."
(
if
(
not
(
kill-buffer
buf
))
;; buffer couldn't be killed.
(
setq
ido-rescan
t
)
;; else buffer was killed so remove name from list.
(
setq
ido-cur-list
(
delq
buf
ido-cur-list
))
;; Some packages, like uniquify.el, may rename buffers when one
;; is killed, so we need to test this condition to avoid using
;; an outdated list of buffer names. We don't want to always
;; rebuild the list of buffers, as this alters the previous
;; buffer order that the user was seeing on the prompt. However,
;; when we rebuild the list, we try to keep the previous second
;; buffer as the first one.
(
catch
'update
(
dolist
(
b
ido-cur-list
)
(
unless
(
get-buffer
b
)
(
setq
ido-cur-list
(
ido-make-buffer-list
(
cadr
ido-matches
)))
(
setq
ido-rescan
t
)
(
throw
'update
nil
))))))
;;; KILL CURRENT BUFFER
(
defun
ido-kill-buffer-at-head
()
"Kill the buffer at the head of `ido-matches'.
...
...
@@ -3942,15 +3918,26 @@ If cursor is not at the end of the user input, delete to end of input."
(
if
(
not
(
eobp
))
(
delete-region
(
point
)
(
line-end-position
))
(
let
((
enable-recursive-minibuffers
t
)
(
buf
(
ido-name
(
car
ido-matches
))))
(
when
buf
(
ido-kill-buffer-internal
buf
)
;; Check if buffer still exists.
(
if
(
get-buffer
buf
)
;; buffer couldn't be killed.
(
buf
(
ido-name
(
car
ido-matches
)))
(
nextbuf
(
cadr
ido-matches
)))
(
when
(
get-buffer
buf
)
;; If next match names a buffer use the buffer object; buffer
;; name may be changed by packages such as uniquify; mindful
;; of virtual buffers.
(
when
(
and
nextbuf
(
get-buffer
nextbuf
))
(
setq
nextbuf
(
get-buffer
nextbuf
)))
(
if
(
null
(
kill-buffer
buf
))
;; Buffer couldn't be killed.
(
setq
ido-rescan
t
)
;; else buffer was killed so remove name from list.
(
setq
ido-cur-list
(
delq
buf
ido-cur-list
)))))))
;; Else `kill-buffer' succeeds so re-make the buffer list
;; taking into account packages like uniquify may rename
;; buffers.
(
if
(
bufferp
nextbuf
)
(
setq
nextbuf
(
buffer-name
nextbuf
)))
(
setq
ido-default-item
nextbuf
ido-text-init
ido-text
ido-exit
'refresh
)
(
exit-minibuffer
))))))
;;; DELETE CURRENT FILE
(
defun
ido-delete-file-at-head
()
...
...
@@ -3988,7 +3975,7 @@ Record command in `command-history' if optional RECORD is non-nil."
((
eq
method
'kill
)
(
if
record
(
ido-record-command
'kill-buffer
buffer
))
(
ido-
kill-buffer
-internal
buffer
))
(
kill-buffer
buffer
))
((
eq
method
'other-window
)
(
if
record
...
...
lisp/iswitchb.el
View file @
b0126eac
...
...
@@ -1027,8 +1027,8 @@ Return the modified list with the last element prepended to it."
(
defun
iswitchb-kill-buffer
()
"Kill the buffer at the head of `iswitchb-matches'."
(
interactive
)
(
let
(
(
enable-recursive-minibuffers
t
)
buf
)
(
let
((
enable-recursive-minibuffers
t
)
buf
)
(
setq
buf
(
car
iswitchb-matches
))
;; check to see if buf is non-nil.
...
...
@@ -1042,8 +1042,10 @@ Return the modified list with the last element prepended to it."
(
if
(
get-buffer
buf
)
;; buffer couldn't be killed.
(
setq
iswitchb-rescan
t
)
;; else buffer was killed so remove name from list.
(
setq
iswitchb-buflist
(
delq
buf
iswitchb-buflist
)))))))
;; Else `kill-buffer' succeeds so re-make the buffer list
;; taking into account packages like uniquify may rename
;; buffers
(
iswitchb-make-buflist
iswitchb-default
))))))
;;; VISIT CHOSEN BUFFER
(
defun
iswitchb-visit-buffer
(
buffer
)
...
...
lisp/mail/rmail.el
View file @
b0126eac
...
...
@@ -191,8 +191,6 @@ please report it with \\[report-emacs-bug].")
:group
'rmail-retrieve
:type
'
(
repeat
(
directory
)))
(
declare-function
mail-position-on-field
"sendmail"
(
field
&optional
soft
))
(
declare-function
mail-text-start
"sendmail"
())
(
declare-function
rmail-dont-reply-to
"mail-utils"
(
destinations
))
(
declare-function
rmail-update-summary
"rmailsum"
(
&rest
ignore
))
...
...
@@ -1643,8 +1641,6 @@ The duplicate copy goes into the Rmail file just after the original."
(
declare-function
rmail-summary-mark-deleted
"rmailsum"
(
&optional
n
undel
))
(
declare-function
rfc822-addresses
"rfc822"
(
header-text
))
(
declare-function
mail-abbrev-make-syntax-table
"mailabbrev.el"
())
(
declare-function
mail-sendmail-delimit-header
"sendmail"
())
(
declare-function
mail-header-end
"sendmail"
())
;; RLK feature not added in this version:
;; argument specifies inbox file or files in various ways.
...
...
@@ -3686,7 +3682,8 @@ see the documentation of `rmail-resend'."
;; The mail buffer is now current.
(
save-excursion
;; Insert after header separator--before signature if any.
(
goto-char
(
mail-text-start
))
(
rfc822-goto-eoh
)
(
forward-line
1
)
(
if
(
or
rmail-enable-mime
rmail-enable-mime-composing
)
(
funcall
rmail-insert-mime-forwarded-message-function
forward-buffer
)
...
...
@@ -3841,6 +3838,10 @@ The message should be narrowed to just the headers."
(
1-
(
point
))
(
point-max
)))))))
(
declare-function
mail-sendmail-delimit-header
"sendmail"
())
(
declare-function
mail-header-end
"sendmail"
())
(
declare-function
mail-position-on-field
"sendmail"
(
field
&optional
soft
))
(
defun
rmail-retry-failure
()
"Edit a mail message which is based on the contents of the current message.
For a message rejected by the mail system, extract the interesting headers and
...
...
@@ -3932,6 +3933,8 @@ specifying headers which should not be copied into the new message."
(
goto-char
(
point-min
))
(
if
bounce-indent
(
indent-rigidly
(
point-min
)
(
point-max
)
bounce-indent
))
;; FIXME better to replace sendmail functions.
(
require
'sendmail
)
(
mail-sendmail-delimit-header
)
(
save-restriction
(
narrow-to-region
(
point-min
)
(
mail-header-end
))
...
...
lisp/menu-bar.el
View file @
b0126eac
...
...
@@ -1272,6 +1272,9 @@ mail status in mode line"))
(define-key menu-bar-games-menu [life]
`(menu-item ,(purecopy "
Life
") life
:help ,(purecopy "
Watch
how
John
Conway
's
cellular
automaton
evolves
")))
(define-key menu-bar-games-menu [land]
`(menu-item ,(purecopy "
Landmark
") landmark
:help ,(purecopy "
Watch
a
neural-network
robot
learn
landmarks
")))
(define-key menu-bar-games-menu [hanoi]
`(menu-item ,(purecopy "
Towers
of
Hanoi
") hanoi
:help ,(purecopy "
Watch
Towers-of-Hanoi
puzzle
solved
by
Emacs
")))
...
...
Prev
1
2
Next
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment