[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r118348: Merge from emacs-24; up to 117698
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] trunk r118348: Merge from emacs-24; up to 117698 |
Date: |
Mon, 10 Nov 2014 07:40:27 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 118348 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2014-11-09 23:39:35 -0800
message:
Merge from emacs-24; up to 117698
modified:
admin/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-2226
admin/unidata/Makefile.in
makefile.in-20091113204419-o5vbwnq5f7feedwu-8551
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/erc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-4305
lisp/erc/erc-backend.el
ercbackend.el-20091113204419-o5vbwnq5f7feedwu-4313
lisp/erc/erc-button.el
ercbutton.el-20091113204419-o5vbwnq5f7feedwu-4314
lisp/erc/erc-join.el ercjoin.el-20091113204419-o5vbwnq5f7feedwu-4364
lisp/erc/erc-match.el
ercmatch.el-20091113204419-o5vbwnq5f7feedwu-4327
lisp/erc/erc-stamp.el
ercstamp.el-20091113204419-o5vbwnq5f7feedwu-4341
lisp/erc/erc.el erc.el-20091113204419-o5vbwnq5f7feedwu-4346
lisp/startup.el startup.el-20091113204419-o5vbwnq5f7feedwu-260
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/fileio.c fileio.c-20091113204419-o5vbwnq5f7feedwu-210
src/nsterm.h nsterm.h-20091113204419-o5vbwnq5f7feedwu-8746
src/nsterm.m nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747
=== modified file 'admin/ChangeLog'
--- a/admin/ChangeLog 2014-11-10 02:01:56 +0000
+++ b/admin/ChangeLog 2014-11-10 07:39:35 +0000
@@ -1,3 +1,8 @@
+2014-11-10 Eli Zaretskii <address@hidden>
+
+ * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use
+ unmsys--file-name. (Bug#18955)
+
2014-11-10 Glenn Morris <address@hidden>
* admin.el (set-version): No need to update doc/man/emacs.1.
=== modified file 'admin/unidata/Makefile.in'
--- a/admin/unidata/Makefile.in 2014-10-14 18:10:37 +0000
+++ b/admin/unidata/Makefile.in 2014-11-10 07:39:35 +0000
@@ -41,7 +41,7 @@
${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
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-11-10 02:58:52 +0000
+++ b/lisp/ChangeLog 2014-11-10 07:39:35 +0000
@@ -1,3 +1,7 @@
+2014-11-10 Glenn Morris <address@hidden>
+
+ * startup.el (command-line): Handle nil elements in load-path.
+
2014-11-10 Stefan Monnier <address@hidden>
* help.el (view-lossage): Include the actual commands run.
=== modified file 'lisp/erc/ChangeLog'
--- a/lisp/erc/ChangeLog 2014-11-09 02:06:29 +0000
+++ b/lisp/erc/ChangeLog 2014-11-10 07:39:35 +0000
@@ -1,3 +1,8 @@
+2014-11-10 Kelvin White <address@hidden>
+
+ * 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 <address@hidden>
* erc.el (erc-send-input): Bind `str' dynamically (bug#18936).
=== modified file 'lisp/erc/erc-backend.el'
--- a/lisp/erc/erc-backend.el 2014-11-09 02:06:29 +0000
+++ b/lisp/erc/erc-backend.el 2014-11-10 07:39:35 +0000
@@ -333,7 +333,7 @@
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 @@
(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)
=== modified file 'lisp/erc/erc-button.el'
--- a/lisp/erc/erc-button.el 2014-02-10 01:34:22 +0000
+++ b/lisp/erc/erc-button.el 2014-11-09 13:46:24 +0000
@@ -183,7 +183,7 @@
'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"
=== modified file 'lisp/erc/erc-join.el'
--- a/lisp/erc/erc-join.el 2014-02-10 01:34:22 +0000
+++ b/lisp/erc/erc-join.el 2014-11-09 13:46:24 +0000
@@ -83,7 +83,7 @@
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 @@
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
=== modified file 'lisp/erc/erc-match.el'
--- a/lisp/erc/erc-match.el 2014-02-10 01:34:22 +0000
+++ b/lisp/erc/erc-match.el 2014-11-09 13:46:24 +0000
@@ -237,7 +237,7 @@
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:
=== modified file 'lisp/erc/erc-stamp.el'
--- a/lisp/erc/erc-stamp.el 2014-11-09 02:06:29 +0000
+++ b/lisp/erc/erc-stamp.el 2014-11-10 07:39:35 +0000
@@ -151,7 +151,7 @@
"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"))
=== modified file 'lisp/erc/erc.el'
--- a/lisp/erc/erc.el 2014-11-09 02:06:29 +0000
+++ b/lisp/erc/erc.el 2014-11-10 07:39:35 +0000
@@ -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 @@
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 ()
=== modified file 'lisp/startup.el'
--- a/lisp/startup.el 2014-11-04 17:46:49 +0000
+++ b/lisp/startup.el 2014-11-10 07:39:35 +0000
@@ -1286,6 +1286,7 @@
(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)
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-11-10 02:58:52 +0000
+++ b/src/ChangeLog 2014-11-10 07:39:35 +0000
@@ -1,3 +1,17 @@
+2014-11-10 Eli Zaretskii <address@hidden>
+
+ * 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 <address@hidden>
+
+ * 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 <address@hidden>
* keyboard.c (command_loop_1): Record this-command in recent-keys.
=== modified file 'src/fileio.c'
--- a/src/fileio.c 2014-10-30 05:15:28 +0000
+++ b/src/fileio.c 2014-11-10 07:39:35 +0000
@@ -4329,8 +4329,11 @@
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
=== modified file 'src/nsterm.h'
--- a/src/nsterm.h 2014-11-08 18:21:38 +0000
+++ b/src/nsterm.h 2014-11-10 07:39:35 +0000
@@ -396,7 +396,7 @@
- repeatScroll: (NSTimer *)sender;
- condemn;
- reprieve;
-- judge;
+- (bool)judge;
@end
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2014-11-09 10:23:46 +0000
+++ b/src/nsterm.m 2014-11-10 07:39:35 +0000
@@ -3803,6 +3803,7 @@
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 @@
{
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 @@
}
-- judge
+-(bool)judge
{
NSTRACE (judge);
+ bool ret = condemned;
if (condemned)
{
EmacsView *view;
@@ -7238,11 +7240,14 @@
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 @@
#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;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r118348: Merge from emacs-24; up to 117698,
Glenn Morris <=