[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 415ef4a 3/3: Merge from origin/emacs-26
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] master 415ef4a 3/3: Merge from origin/emacs-26 |
|
Date: |
Wed, 28 Nov 2018 10:55:15 -0500 (EST) |
branch: master
commit 415ef4a2b02dac17bf1bb962154633e671e561dd
Merge: 2c59cfa 74a3a79
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-26
74a3a79 (origin/emacs-26) Fix a typo in a doc string
911766d Minor markup fix in frames.texi
19ed1e9 * lisp/net/trampver.el (customize-package-emacs-version-alist...
d7132ad * lisp/mh-e/mh-e.el (customize-package-emacs-version-alist): ...
5f39260 * lisp/emacs-lisp/map-ynp.el (map-y-or-n-p): Pass format to m...
a291f62 Don't call xwidget functions until GTK has been initialized
f0531b8 Improve documentation of Ediff wordwise commands
2925ce5 Support Hunspell 1.7.0 in ispell.el
03bb7a8 Avoid clearing echo-area message by auto-save-visited-file-name
---
doc/lispref/frames.texi | 2 +-
doc/misc/ediff.texi | 13 ++++++-------
lisp/emacs-lisp/map-ynp.el | 10 +++++++---
lisp/mh-e/mh-e.el | 5 +++--
lisp/net/trampver.el | 2 +-
lisp/textmodes/ispell.el | 7 ++++++-
lisp/vc/ediff.el | 9 ++++++---
src/gtkutil.c | 4 ++++
src/gtkutil.h | 1 +
src/xwidget.c | 6 ++++++
10 files changed, 41 insertions(+), 18 deletions(-)
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index ad5d0fc..b961d68 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -503,7 +503,7 @@ Height | | | Height | | | Height
In practice not all of the areas shown in the drawing will or may be
present. The meaning of these areas is described below.
address@hidden @samp
address@hidden @asis
@item Outer Frame
@cindex outer frame
@cindex outer edges
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi
index 746c4c8..cce8321 100644
--- a/doc/misc/ediff.texi
+++ b/doc/misc/ediff.texi
@@ -210,11 +210,11 @@ ancestors. Ediff selects only the files that are under
version control.
@item ediff-windows-wordwise
@findex ediff-windows-wordwise
-Compare windows word-by-word.
+Compare text visible in 2 windows word-by-word.
@item ediff-windows-linewise
@findex ediff-windows-linewise
-Compare windows line-by-line.
+Compare text visible in 2 windows line-by-line.
@item ediff-regions-wordwise
@findex ediff-regions-wordwise
@@ -373,13 +373,12 @@ The commands @code{ediff-windows-wordwise},
@code{ediff-windows-linewise}, @code{ediff-regions-wordwise} and
@code{ediff-regions-linewise} do comparison on parts of existing Emacs
buffers. The commands @code{ediff-windows-wordwise} and
address@hidden are intended for relatively small segments
-of buffers (e.g., up to 100 lines, depending on the speed of your machine),
address@hidden could be slow on very large buffers,
as they perform comparison on the basis of words rather than lines.
-(Word-wise comparison of large chunks of text can be slow.)
+(Word-wise comparison of large chunks of text is relatively expensive.)
-To compare large regions, use @code{ediff-regions-linewise}. This
-command displays differences much like @code{ediff-files} and
+To compare very large regions, use @code{ediff-regions-linewise}.
+This command displays differences much like @code{ediff-files} and
@code{ediff-buffers}.
The functions @code{ediff-patch-file} and @code{ediff-patch-buffer} apply a
diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index a61c0ad..27e8ea6 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -79,6 +79,7 @@ are meaningful here.
Returns the number of actions taken."
(let* ((actions 0)
+ (msg (current-message))
user-keys mouse-event map prompt char elt def
;; Non-nil means we should use mouse menus to ask.
use-menus
@@ -246,9 +247,12 @@ C-g to quit (cancel the whole command);
(if delayed-switch-frame
(setq unread-command-events
(cons delayed-switch-frame unread-command-events))))
- ;; Clear the last prompt from the minibuffer.
+ ;; Clear the last prompt from the minibuffer, and restore the
+ ;; previous echo-area message, if any.
(let ((message-log-max nil))
- (message ""))
+ (if msg
+ (message "%s" msg)
+ (message "")))
;; Return the number of actions that were taken.
actions))
@@ -261,7 +265,7 @@ C-g to quit (cancel the whole command);
"If non-nil, `read-answer' accepts single-character answers.
If t, accept short (single key-press) answers to the question.
If nil, require long answers. If `auto', accept short answers if
-the function cell of `yes-or-no-p' is set to `y-or-on-p'."
+the function cell of `yes-or-no-p' is set to `y-or-n-p'."
:type '(choice (const :tag "Accept short answers" t)
(const :tag "Require long answer" nil)
(const :tag "Guess preference" auto))
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 4515144..54a62b8 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -1029,12 +1029,13 @@ windows in the frame are removed."
(when delete-other-windows-flag
(delete-other-windows)))
-;; FIXME: Maybe out of date? --xfq
(if (boundp 'customize-package-emacs-version-alist)
(add-to-list 'customize-package-emacs-version-alist
'(MH-E ("6.0" . "22.1") ("6.1" . "22.1") ("7.0" . "22.1")
("7.1" . "22.1") ("7.2" . "22.1") ("7.3" . "22.1")
- ("7.4" . "22.1") ("8.0" . "22.1"))))
+ ("7.4" . "22.1") ("8.0" . "22.1") ("8.1" . "23.1")
+ ("8.2" . "23.1") ("8.3" . "24.1") ("8.4" . "24.4")
+ ("8.5" . "24.4") ("8.6" . "24.4"))))
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index d9b152e..ebd581b 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -78,7 +78,7 @@
("2.2.3-24.1" . "24.1") ("2.2.3-24.1" . "24.2") ("2.2.6-24.3" . "24.3")
("2.2.9-24.4" . "24.4") ("2.2.11-24.5" . "24.5")
("2.2.13.25.1" . "25.1") ("2.2.13.25.2" . "25.2")
- ("2.2.13.25.2" . "25.3")
+ ("2.2.13.25.2" . "25.3") ("2.3.3" . "26.1")
("2.3.3.26.1" . "26.1") ("2.3.5.26.2" . "26.2")))
(add-hook 'tramp-unload-hook
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 87bcb5d..6408f38 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1106,7 +1106,12 @@ dictionary from that list was found."
null-device
t
nil
- "-D")
+ ;; Hunspell 1.7.0 (and later?) won't
+ ;; show LOADED DICTIONARY unless
+ ;; there's at least one file argument
+ ;; on the command line. So we feed
+ ;; it with the null device.
+ "-D" null-device)
(buffer-string))
"[\n\r]+"
t))
diff --git a/lisp/vc/ediff.el b/lisp/vc/ediff.el
index 32a6820..f424fdb 100644
--- a/lisp/vc/ediff.el
+++ b/lisp/vc/ediff.el
@@ -923,6 +923,7 @@ MERGE-AUTOSTORE-DIR is the directory in which to store
merged files."
;;;###autoload
(defun ediff-windows-wordwise (dumb-mode &optional wind-A wind-B startup-hooks)
"Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
+This compares the portions of text visible in each of the two windows.
With prefix argument, DUMB-MODE, or on a non-windowing display, works as
follows:
If WIND-A is nil, use selected window.
@@ -936,6 +937,7 @@ arguments after setting up the Ediff buffers."
;;;###autoload
(defun ediff-windows-linewise (dumb-mode &optional wind-A wind-B startup-hooks)
"Compare WIND-A and WIND-B, which are selected by clicking, linewise.
+This compares the portions of text visible in each of the two windows.
With prefix argument, DUMB-MODE, or on a non-windowing display, works as
follows:
If WIND-A is nil, use selected window.
@@ -946,7 +948,8 @@ arguments after setting up the Ediff buffers."
(ediff-windows dumb-mode wind-A wind-B
startup-hooks 'ediff-windows-linewise nil))
-;; Compare WIND-A and WIND-B, which are selected by clicking.
+;; Compare visible portions of text in WIND-A and WIND-B, which are
+;; selected by clicking.
;; With prefix argument, DUMB-MODE, or on a non-windowing display,
;; works as follows:
;; If WIND-A is nil, use selected window.
@@ -987,8 +990,8 @@ arguments after setting up the Ediff buffers."
"Run Ediff on a pair of regions in specified buffers.
BUFFER-A and BUFFER-B are the buffers to be compared.
Regions (i.e., point and mark) can be set in advance or marked interactively.
-This function is effective only for relatively small regions, up to 200
-lines. For large regions, use `ediff-regions-linewise'.
+This function might be slow for large regions. If you find it slow,
+use `ediff-regions-linewise' instead.
STARTUP-HOOKS is a list of functions that Emacs calls without
arguments after setting up the Ediff buffers."
(interactive
diff --git a/src/gtkutil.c b/src/gtkutil.c
index da4a0ae..382039c 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -147,6 +147,8 @@ struct xg_frame_tb_info
GtkTextDirection dir;
};
+bool xg_gtk_initialized; /* Used to make sure xwidget calls are
possible */
+
static GtkWidget * xg_get_widget_from_map (ptrdiff_t idx);
@@ -5321,6 +5323,8 @@ xg_initialize (void)
#ifdef HAVE_FREETYPE
x_last_font_name = NULL;
#endif
+
+ xg_gtk_initialized = true;
}
#endif /* USE_GTK */
diff --git a/src/gtkutil.h b/src/gtkutil.h
index 7dcd549..3b07407 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -202,5 +202,6 @@ extern void xg_initialize (void);
to indicate that the callback should do nothing. */
extern bool xg_ignore_gtk_scrollbar;
+extern bool xg_gtk_initialized;
#endif /* USE_GTK */
#endif /* GTKUTIL_H */
diff --git a/src/xwidget.c b/src/xwidget.c
index 6faac10..6da7a0b 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -78,6 +78,8 @@ Returns the newly constructed xwidget, or nil if construction
fails. */)
Lisp_Object title, Lisp_Object width, Lisp_Object height,
Lisp_Object arguments, Lisp_Object buffer)
{
+ if (!xg_gtk_initialized)
+ error ("make-xwidget: GTK has not been initialized");
CHECK_SYMBOL (type);
CHECK_FIXNAT (width);
CHECK_FIXNAT (height);
@@ -513,6 +515,10 @@ xwidget_init_view (struct xwidget *xww,
struct glyph_string *s,
int x, int y)
{
+
+ if (!xg_gtk_initialized)
+ error ("xwidget_init_view: GTK has not been initialized");
+
struct xwidget_view *xv = allocate_xwidget_view ();
Lisp_Object val;