mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-21 06:55:39 +00:00
Code Issues Releases Activity

Merge from emacs-24; up to 117698

Browse Source
This commit is contained in:
Glenn Morris 2014-11-09 23:39:35 -08:00
commit c832df2ec2
15 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/ChangeLog
View File

@ -1,3 +1,8 @@
2014-11-10 Eli Zaretskii <eliz@gnu.org>
* unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use
unmsys--file-name. (Bug#18955)
2014-11-10 Glenn Morris <rgm@gnu.org>
* admin.el (set-version): No need to update doc/man/emacs.1.

2
admin/unidata/Makefile.in
View File

@ -41,7 +41,7 @@ all: ${top_srcdir}/src/macuvs.h unifiles
${top_srcdir}/src/macuvs.h: ${srcdir}/uvs.el ${srcdir}/IVD_Sequences.txt | \
${srcdir}/uvs.elc
${emacs} -L ${srcdir} -l uvs \
--eval '(uvs-print-table-ivd "${srcdir}/IVD_Sequences.txt" "Adobe-Japan1")' \
--eval '(uvs-print-table-ivd (unmsys--file-name "${srcdir}/IVD_Sequences.txt") "Adobe-Japan1")' \
> $@
%.elc: %.el

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2014-11-10 Glenn Morris <rgm@gnu.org>
* startup.el (command-line): Handle nil elements in load-path.
2014-11-10 Stefan Monnier <monnier@iro.umontreal.ca>
* help.el (view-lossage): Include the actual commands run.

5
lisp/erc/ChangeLog
View File

@ -1,3 +1,8 @@
2014-11-10 Kelvin White <kwhite@gnu.org>
* erc-match.el, erc-join.el, erc-stamp.el, erc-backend.el, erc.el:
* erc-button.el: Update version to 24.5.
2014-11-05 Stefan Monnier <monnier@iro.umontreal.ca>
* erc.el (erc-send-input): Bind `str' dynamically (bug#18936).

4
lisp/erc/erc-backend.el
View File

@ -333,7 +333,7 @@ Good luck."
This will only be consulted if the coding system in
`erc-server-coding-system' is `undecided'."
:group 'erc-server
:version "24.1"
:version "24.5"
:type '(repeat coding-system))
(defcustom erc-server-coding-system (if (and (fboundp 'coding-system-p)
@ -400,7 +400,7 @@ isn't displayed."
(defcustom erc-server-timestamp-format "%Y-%m-%d %T"
"Timestamp format used with server response messages.
This string is processed using `format-time-string'."
:version "24.3"
:version "24.5"
:type 'string
:group 'erc-server)

2
lisp/erc/erc-button.el
View File

@ -183,7 +183,7 @@ PAR is a number of a regexp grouping whose text will be passed to
'nicknames, these are ignored, and CALLBACK will be called with
the nickname matched as the argument."
:group 'erc-button
:version "24.3" ; remove finger (bug#4443)
:version "24.5" ; remove finger (bug#4443)
:type '(repeat
(list :tag "Button"
(choice :tag "Matches"

4
lisp/erc/erc-join.el
View File

@ -83,7 +83,7 @@ If the value is `ident', autojoin after successful NickServ
identification, or after `erc-autojoin-delay' seconds.
Any other value means the same as `connect'."
:group 'erc-autojoin
:version "24.1"
:version "24.5"
:type '(choice (const :tag "On Connection" connect)
(const :tag "When Identified" ident)))
@ -93,7 +93,7 @@ This only takes effect if `erc-autojoin-timing' is `ident'.
If NickServ identification occurs before this delay expires, ERC
autojoins immediately at that time."
:group 'erc-autojoin
:version "24.1"
:version "24.5"
:type 'integer)
(defcustom erc-autojoin-domain-only t

2
lisp/erc/erc-match.el
View File

@ -237,7 +237,7 @@ current-nick, keyword, pal, dangerous-host, fool"
useful for excluding all the things like MOTDs from the server
and other miscellaneous functions."
:group 'erc-match
:version "24.3"
:version "24.5"
:type 'boolean)
;; Internal variables:

2
lisp/erc/erc-stamp.el
View File

@ -151,7 +151,7 @@ the minibuffer."
"Whether the timestamps should be intangible, i.e. prevent the point
from entering them and instead jump over them."
:group 'erc-stamp
:version "25.1"
:version "24.5"
:type 'boolean)
(defface erc-timestamp-face '((t :weight bold :foreground "green"))

4
lisp/erc/erc.el
View File

@ -104,7 +104,7 @@
(defgroup erc-lurker nil
"Hide specified message types sent by lurkers"
:version "24.3"
:version "24.5"
:group 'erc-ignore)
(defgroup erc-query nil
@ -5291,7 +5291,7 @@ into the ERC buffer, that text is not sent to the IRC server.
If the value is nil, `erc-send-current-line' always considers any
submitted line to be intentional."
:group 'erc
:version "24.4"
:version "24.5"
:type '(choice number (other :tag "disabled" nil)))
(defun erc-send-current-line ()

1
lisp/startup.el
View File

@ -1286,6 +1286,7 @@ the `--debug-init' option to view a complete error backtrace."
(let (warned)
(dolist (dir load-path)
(and (not warned)
(stringp dir)
(string-equal (file-name-as-directory (expand-file-name dir))
(expand-file-name user-emacs-directory))
(setq warned t)

14
src/ChangeLog
View File

@ -1,3 +1,17 @@
2014-11-10 Eli Zaretskii <eliz@gnu.org>
* fileio.c (Finsert_file_contents): Invalidate buffer caches also
when the inserted text does not need decoding. (Bug#18982)
2014-11-10 Jan Djärv <jan.h.d@swipnet.se>
* nsterm.h (EmacsScroller): judge returns bool.
* nsterm.m (ns_set_vertical_scroll_bar): Release bar.
(ns_judge_scroll_bars): Only set removed if judge returns true.
(judge): Returns bool == condemned. Remove self from window.
(setPosition:portion:whole:): Remove raise SIGIO (Bug#18757).
2014-11-10 Stefan Monnier <monnier@iro.umontreal.ca>
* keyboard.c (command_loop_1): Record this-command in recent-keys.

7
src/fileio.c
View File

@ -4329,8 +4329,11 @@ by calling `format-decode', which see. */)
coding_system = CODING_ID_NAME (coding.id);
}
else if (inserted > 0)
adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted,
inserted);
{
invalidate_buffer_caches (current_buffer, PT, PT + inserted);
adjust_after_insert (PT, PT_BYTE, PT + inserted, PT_BYTE + inserted,
inserted);
}
/* Call after-change hooks for the inserted text, aside from the case
of normal visiting (not with REPLACE), which is done in a new buffer

2
src/nsterm.h
View File

@ -396,7 +396,7 @@ typedef float EmacsCGFloat;
- repeatScroll: (NSTimer *)sender;
- condemn;
- reprieve;
- judge;
- (bool)judge;
@end

18
src/nsterm.m
View File

@ -3803,6 +3803,7 @@ overwriting cursor (usually when cursor on a tab) */
bar = XNS_SCROLL_BAR (window->vertical_scroll_bar);
[bar removeFromSuperview];
wset_vertical_scroll_bar (window, Qnil);
[bar release];
}
ns_clear_frame_area (f, left, top, width, height);
unblock_input ();
@ -3996,8 +3997,8 @@ overwriting cursor (usually when cursor on a tab) */
{
view = [subviews objectAtIndex: i];
if (![view isKindOfClass: [EmacsScroller class]]) continue;
[view judge];
removed = YES;
if ([view judge])
removed = YES;
}
if (removed)
@ -7227,9 +7228,10 @@ - (void)dealloc
}
- judge
-(bool)judge
{
NSTRACE (judge);
bool ret = condemned;
if (condemned)
{
EmacsView *view;
@ -7238,11 +7240,14 @@ - (void)dealloc
view = (EmacsView *)FRAME_NS_VIEW (frame);
if (view != nil)
view->scrollbarsNeedingUpdate++;
if (window)
wset_vertical_scroll_bar (window, Qnil);
window = 0;
[self removeFromSuperview];
[self release];
unblock_input ();
}
return self;
return ret;
}
@ -7297,11 +7302,6 @@ - (int) checkSamePosition: (int) position portion: (int) portion
#endif
}
/* Events may come here even if the event loop is not running.
If we don't enter the event loop, the scroll bar will not update.
So send SIGIO to ourselves. */
if (apploopnr == 0) raise (SIGIO);
return self;
}