Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
66399c0a
Commit
66399c0a
authored
Jan 14, 2011
by
Kenichi Handa
Browse files
Options
Browse Files
Download
Plain Diff
merge emacs-23
parents
1a6a03e4
c88aaf48
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
53 additions
and
12 deletions
+53
-12
lisp/ChangeLog
lisp/ChangeLog
+4
-0
lisp/gnus/ChangeLog
lisp/gnus/ChangeLog
+4
-0
lisp/gnus/message.el
lisp/gnus/message.el
+24
-4
lisp/subr.el
lisp/subr.el
+21
-8
No files found.
lisp/ChangeLog
View file @
66399c0a
...
...
@@ -9,6 +9,10 @@
(rmail-show-mime): If only a header part was decoded, find the
coding system while ignoring mm-charset-override-alist.
2011-01-13 Chong Yidong <cyd@stupidchicken.com>
* subr.el (event-start, event-end): Doc fix (Bug#7826).
2011-01-12 Kenichi Handa <handa@m17n.org>
* mail/rmailmm.el (rmail-mime-next-item)
...
...
lisp/gnus/ChangeLog
View file @
66399c0a
2011-01-13 Chong Yidong <cyd@stupidchicken.com>
* message.el (message-bury): Add special-case handling for Rmail.
2011-01-12 Glenn Morris <rgm@gnu.org>
* message.el (message-mail): A compose-mail function should
...
...
lisp/gnus/message.el
View file @
66399c0a
...
...
@@ -4023,12 +4023,32 @@ Instead, just auto-save the buffer and then bury it."
(defun message-bury (buffer)
"Bury this mail BUFFER."
(let ((newbuf (other-buffer buffer)))
(bury-buffer buffer)
(if (and (window-dedicated-p (selected-window))
(let ((newbuf (other-buffer
(current-
buffer)))
)
(bury-buffer
(current-
buffer)
)
(if (and (window-dedicated-p (
frame-
selected-window))
(not (null (delq (selected-frame) (visible-frame-list)))))
(delete-frame (selected-frame))
(switch-to-buffer newbuf))))
;; Temporary hack to make this behave like `mail-bury', when
;; used with Rmail. Replaced in Emacs 24 with
(let (rmail-flag summary-buffer)
(and (not (one-window-p))
(with-current-buffer
(window-buffer (next-window (selected-window) 'not))
(setq rmail-flag (eq major-mode 'rmail-mode))
(setq summary-buffer
(and (if (boundp 'mail-bury-selects-summary)
mail-bury-selects-summary
t)
(boundp 'rmail-summary-buffer)
rmail-summary-buffer
(buffer-name rmail-summary-buffer)
(not (get-buffer-window rmail-summary-buffer))
rmail-summary-buffer))))
(if rmail-flag
;; If the Rmail buffer has a summary, show that.
(if summary-buffer (switch-to-buffer summary-buffer)
(delete-window))
(switch-to-buffer newbuf))))))
(defun message-send (&optional arg)
"Send the message in the current buffer.
...
...
lisp/subr.el
View file @
66399c0a
...
...
@@ -854,24 +854,37 @@ in the current Emacs session, then this function may return nil."
(
defsubst
event-start
(
event
)
"Return the starting position of EVENT.
If
EVENT
is a mouse or key press or a mouse click, this returns the location
o
f
the event.
If EVENT is a drag, this returns the drag's starting position.
The return value is of
the form
EVENT
should be a click, drag, or key press event.
I
f
it is a key press event, the return value has the form
(WINDOW POS (0 . 0) 0)
If it is a click or drag event, it has
the form
(WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW)
IMAGE (DX . DY) (WIDTH . HEIGHT))
The `posn-' functions access elements of such lists."
The `posn-' functions access elements of such lists.
For more information, see Info node `(elisp)Click Events'.
If EVENT is a mouse or key press or a mouse click, this is the
position of the event. If EVENT is a drag, this is the starting
position of the drag."
(
if
(
consp
event
)
(
nth
1
event
)
(
list
(
selected-window
)
(
point
)
'
(
0
.
0
)
0
)))
(
defsubst
event-end
(
event
)
"Return the ending location of EVENT.
EVENT should be a click, drag, or key press event.
If EVENT is a click event, this function is the same as `event-start'.
The return value is of the form
If EVENT is a key press event, the return value has the form
(WINDOW POS (0 . 0) 0)
If EVENT is a click event, this function is the same as
`event-start'. For click and drag events, the return value has
the form
(WINDOW AREA-OR-POS (X . Y) TIMESTAMP OBJECT POS (COL . ROW)
IMAGE (DX . DY) (WIDTH . HEIGHT))
The `posn-' functions access elements of such lists."
The `posn-' functions access elements of such lists.
For more information, see Info node `(elisp)Click Events'.
If EVENT is a mouse or key press or a mouse click, this is the
position of the event. If EVENT is a drag, this is the starting
position of the drag."
(
if
(
consp
event
)
(
nth
(
if
(
consp
(
nth
2
event
))
2
1
)
event
)
(
list
(
selected-window
)
(
point
)
'
(
0
.
0
)
0
)))
...
...
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