[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 294127e 13/19: Merge from origin/emacs-24
From: |
Fabiแn Ezequiel Gallina |
Subject: |
[Emacs-diffs] master 294127e 13/19: Merge from origin/emacs-24 |
Date: |
Wed, 28 Jan 2015 04:50:13 +0000 |
branch: master
commit 294127e7d59a5d23a32561716a1b192db410e12f
Merge: 358a8b3 24aacfc
Author: Fabiรกn Ezequiel Gallina <address@hidden>
Commit: Fabiรกn Ezequiel Gallina <address@hidden>
Merge from origin/emacs-24
24aacfc Improve documentation of buttons (Bug#19628)
52ae3db doc/lispref/text.texi (Clickable Text): Improve indexing.
(Bug#19629)
310f707 lisp/button.el (button-activate, push-button): Doc fix. (Bug#19628)
3ee38f2 Disallow w32 builds --without-toolkit-scroll-bars.
e6518fc Fix display of images in R2L screen lines
b0af674 Use u+05f4 in TUTORIAL.he.
---
ChangeLog | 7 ++++
configure.ac | 3 ++
doc/lispref/ChangeLog | 7 ++++
doc/lispref/display.texi | 10 ++++--
doc/lispref/text.texi | 1 +
etc/ChangeLog | 5 +++
etc/tutorials/TUTORIAL.he | 74 ++++++++++++++++++++++----------------------
lisp/ChangeLog | 4 ++
lisp/button.el | 20 +++++++-----
src/ChangeLog | 6 ++++
src/xdisp.c | 9 +++++
11 files changed, 96 insertions(+), 50 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 68a7341..00a9d00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-20 Eli Zaretskii <address@hidden>
+
+ * configure.ac (HAVE_W32): Abort with error message if
+ --without-toolkit-scroll-bars was specified. See
+ http://lists.gnu.org/archive/html/emacs-devel/2015-01/msg00525.html
+ for the details.
+
2015-01-27 Paul Eggert <address@hidden>
Port autogen.sh hook creation to private templates
diff --git a/configure.ac b/configure.ac
index cd011b9..5776e4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1938,6 +1938,9 @@ CM_OBJ="cm.o"
XARGS_LIMIT=
if test "${HAVE_W32}" = "yes"; then
AC_DEFINE(HAVE_NTGUI, 1, [Define to use native MS Windows GUI.])
+ if test "$with_toolkit_scroll_bars" = "no"; then
+ AC_MSG_ERROR([Non-toolkit scroll bars are not implemented for w32 build.])
+ fi
AC_CHECK_TOOL(WINDRES, [windres],
[AC_MSG_ERROR([No resource compiler found.])])
W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o"
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 801a733..2bbe28e 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,10 @@
+2015-01-20 Eli Zaretskii <address@hidden>
+
+ * display.texi (Manipulating Buttons): Explain more about the
+ 'action' property. (Bug#19628)
+
+ * text.texi (Clickable Text): Improve indexing. (Bug#19629)
+
2015-01-15 Eli Zaretskii <address@hidden>
* variables.texi (Creating Buffer-Local): Improve indexing.
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 1b7f21d..b09b82a 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -5735,10 +5735,12 @@ Set @var{button}'s @var{prop} property to @var{val}.
@end defun
@defun button-activate button &optional use-mouse-action
-Call @var{button}'s @code{action} property (i.e., invoke it). If
address@hidden is address@hidden, try to invoke the button's
address@hidden property instead of @code{action}; if the button
-has no @code{mouse-action} property, use @code{action} as normal.
+Call @var{button}'s @code{action} property (i.e., invoke the function
+that is the value of that property, passing it the single argument
address@hidden). If @var{use-mouse-action} is address@hidden, try to
+invoke the button's @code{mouse-action} property instead of
address@hidden; if the button has no @code{mouse-action} property, use
address@hidden as normal.
@end defun
@defun button-label button
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 1b8897f..a7cfb22 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -3731,6 +3731,7 @@ clicks on the link quickly without moving the mouse.
This behavior is
controlled by the user option @code{mouse-1-click-follows-link}.
@xref{Mouse References,,, emacs, The GNU Emacs Manual}.
address@hidden follow-link (text or overlay property)
To set up the link so that it obeys
@code{mouse-1-click-follows-link}, you must either (1) apply a
@code{follow-link} text or overlay property to the link text, or (2)
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 0677e44..8e46cd0 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-17 Eli Zaretskii <address@hidden>
+
+ * tutorials/TUTORIAL.he: Use u+05f4 HEBREW PUNCTUATION GERSHAYIM
+ instead of u+0022 QUOTATION MARK in Hebrew acronyms.
+
2015-01-27 Ivan Shmakov <address@hidden>
* NEWS: Mention the new tar-new-entry command. (Bug#19274)
diff --git a/etc/tutorials/TUTORIAL.he b/etc/tutorials/TUTORIAL.he
index b391098..beb406e 100644
--- a/etc/tutorials/TUTORIAL.he
+++ b/etc/tutorials/TUTORIAL.he
@@ -14,10 +14,10 @@
ืืื ืืืคืกืืง ืคืงืืื ืืืืฆืข ืืืงืฉื, ืืฉ ืืืงืืฉ C-g.
ืืืืจืืืช ">>" ืืงืฆื ืืืื ื ืืกืื ืช ืืืจืืืช ืขืืืจืื ืืื ืื ืกืืช ืืืฉืชืืฉ ืืคืงืืื ืืืฉืื.
ืืืืืื:
-<<ืฉืืจืืช ืจืืงืืช ืชืชืืืกืคื ื ืกืืื ืืฉืืจื ืืืื ืข"ื help-with-tutorial>>
+<<ืฉืืจืืช ืจืืงืืช ืชืชืืืกืคื ื ืกืืื ืืฉืืจื ืืืื ืขืดื help-with-tutorial>>
[ืืืฆืข ืืขืืื ืืืฉืืจ ืจืืง ืืืืจืืช ืืืืืืืืช. ืืืงืกื ืืืฉืื ืืืื]
>> ืืงืืฉื ืขืชื C-v (ืืฆื ืืขืืื ืืื) ืขืึพืื ืช ืืืชืงืื ืืขืืื ืืื. (ืงืืืื, ื ืกื
- ืืืช ืข"ื ืืืืฆื ืืืืืงื ืฉื ืืงืฉ CONTROL ืืืงืฉื ืขื v.)
+ ืืืช ืขืดื ืืืืฆื ืืืืืงื ืฉื ืืงืฉ CONTROL ืืืงืฉื ืขื v.)
ืืขืชื ืืืืื, ืขืืืื ืืขืฉืืช ืืืช ืืื ืคืขื ืฉืชืกืืืื ืืงืจืื ืืช ืืืืฆื ืขื ืืืกื.
ืฉืืื ืื ืืืคืืคื ืฉื ืฉืชื ืฉืืจืืช ืืืฉืจ ืืชื ืขืืืจืื ืืืกื ืืืฉื, ืื ืฉืืืืื ืจืฆืืคืืช
@@ -99,7 +99,7 @@ P ืึพprevious (ืงืืื), N ืึพNext (ืืื), B ืึพBackward (ืืืืจื)
ืืชืฆืืื. ืืื ืงืืจืืื "ืืืืื". ืืืืื ืืืคืฉืจืช ืึพEmacs ืืื ืืข ืืช ืืกืื ืืืงืื
ืืืฉืื ืืืงืกื ืืืื ืฉืืกืื ืืืขืื ืืืชืฆืืื.
->> ื ืกื ืืื ืืข ืืช ืืกืื ืื ืืืืฅ ืืชืฆืืื ืข"ื ืืงืฉืช C-n ืืฉืืื ืื ืืื ืฉืงืืจื.
+>> ื ืกื ืืื ืืข ืืช ืืกืื ืื ืืืืฅ ืืชืฆืืื ืขืดื ืืงืฉืช C-n ืืฉืืื ืื ืืื ืฉืงืืจื.
ืื ืชื ืืขื ืชืึพืชื ืืืืืช ืืื, ืชืืืื ืื ืืข ืืืืื ืฉืืืืช. M-f โ(META-f) ืืืื
ืืช ืืกืื ืืืื ืืืช ืงืืืื ืืืืื M-b ืื ืืืื ืืืืจื.
@@ -196,18 +196,18 @@ argument) ืืฉืื ืืงืืฉืื ืืืชื ืืคื ื ืืคืงืืื ืืืื ืืื
>> ื ืกื ืขืชื ืืืงืืฉ C-u 8 C-v.
ืืชืืฆืื, ืืชืฆืืื ืืืชื ืฆืจืืื ืืืื ืึพ8 ืฉืืจืืช. ืื ืืจืฆืื ืื ืืืืื ืืืืจื,
-ืืคืฉืจ ืืืฉืื ืืืช ืข"ื ืืชื ืืจืืืื ื ืึพM-v.
+ืืคืฉืจ ืืืฉืื ืืืช ืขืดื ืืชื ืืจืืืื ื ืึพM-v.
ืื ืืคืขืืชื ืืช Emacs ืขืึพืืื ืชืฆืืื ืืจืคืืช ืืืื X ืื MS-Windows, ืืชื
ืฆืจืืืื ืืจืืืช ืคืก ืฆืจ ืืืืื, ืฉืฉืื ืคืก ืืืืื (scroll bar) ืืฆืืื ืฉื ืืืืื
-ืฉื Emacs. ื ืืชื ืืืืื ืืช ืืืงืกื ืข"ื ืืงืืงืช ืขืืืจ ืืชืื ืคืก ืืืืืื.
+ืฉื Emacs. ื ืืชื ืืืืื ืืช ืืืงืกื ืขืดื ืืงืืงืช ืขืืืจ ืืชืื ืคืก ืืืืืื.
ืื ืืขืืืจ ืฉืืื ืืฆืืื ืืืืื, ืชืืืื ืืืฉืชืืฉ ืื ืื ืืืืืืช ืืืงืกื.
* ืื Emacs ืืคืกืืง ืืืืื
----------------------
-ืื Emacs ืืคืกืืง ืืืืื ืืคืงืืืืช, ืชืืืื ืืืคืกืืง ืืืชื ืืืืื ืข"ื ืืงืฉืช C-g.
+ืื Emacs ืืคืกืืง ืืืืื ืืคืงืืืืช, ืชืืืื ืืืคืกืืง ืืืชื ืืืืื ืขืดื ืืงืฉืช C-g.
ืคืงืืืืช ืฉืืืฆืืขื ืืชืืจื ืืฃ ืื ื ืืชื ืืช ืืืคืกืงื ืืขืืจืช C-g.
ืื ืืกืฃ, ืชืืจืื ืืงืฉืช C-g ืืืืืื ืืืจืืืื ื ืื ืืืจื ืื ืชืืืืช ืืคืงืืื ืฉืืจื
@@ -272,7 +272,7 @@ argument) ืืฉืื ืืงืืฉืื ืืืชื ืืคื ื ืืคืงืืื ืืืื ืืื
ืืชืื ืฉืืืงืืืช ืฉืืื ืงืืื ืืงืฉ ืฉืขืืื ืจืฉืื <Delete>, ืื ืื ืืื ื ืืืงืฉ ืฉืื ื
ืงืืจืืื ืื <DEL>.
->> ืืงืืฉื ืขืชื ืืกืคืจ ืชืืื, ืืืืจึพืื ืืืงื ืืืชื ืข"ื ืืงืฉืืช ืืืืืช
+>> ืืงืืฉื ืขืชื ืืกืคืจ ืชืืื, ืืืืจึพืื ืืืงื ืืืชื ืขืดื ืืงืฉืืช ืืืืืช
ืขื <DEL>. ืื ืชืืฉืฉื ืืฉื ืืช ืืช ืืงืืืฅ ืืื -- ืืขืืชืง ืืืงืืจื
ืฉื ืืฉืืขืืจ ืืืฉืืจ ืืื ืฉืื ืื. ืืชื ืขืืืืื ืขื ืืขืืชืง ืืืืฉื ืฉืืื.
@@ -402,7 +402,7 @@ argument) ืืฉืื ืืงืืฉืื ืืืชื ืืคื ื ืืคืงืืื ืืืื ืืื
ืื ืฉืื ืืชื ืืช ืืืงืกื ืืื ืืืืืชื ืฉืืฉืื ืื ืืื ืืขืืช, ืชืืืื ืืืื ืืช ืืฉืื ืื
ืืขืืจืช ืคืงืืืช ืืืืืื, โชC-/โฌ.
-ืืืจื ืืื,โชC-/โฌ ืืืื ืืช ืืฉืื ืืืื ืฉืืืฆืขื ืข"ื ืคืงืืื ืืืช. ืืคืขืื ืืืืจืช ืฉื
+ืืืจื ืืื,โชC-/โฌ ืืืื ืืช ืืฉืื ืืืื ืฉืืืฆืขื ืขืดื ืคืงืืื ืืืช. ืืคืขืื ืืืืจืช ืฉื
โชC-/โฌ ืืจืฆืฃ ืืืืืช ืฉืื ืืืื ืฉื ืคืงืืืืช ืงืืืืืช, ืืืช ืืืจื ืืฉื ืื.
ืฉื ื ืืืฆืืื ืืืืื ืืื: ืคืงืืืืช ืฉืืื ื ืืฉื ืืช ืืงืกื (ืืืฉื ืคืงืืืืช ืื ืขืช ืืกืื
@@ -468,7 +468,7 @@ C-x u, ืืึพืื ืืื ืคืืืช ื ืืื ืืืงืฉื ืืกืคืจ ืคืขืืื ืืื
ืคืงืืื ืื ืฉืืืจืช ืืงืืืฅ ืืช ืืืงืกื ืืืืืืง ืืชืื Emacs. ืืคืขื ืืจืืฉืื ื ืฉืชืคืขืืื
ืคืงืืื ืื, Emacs ืืฉื ื ืืช ืฉื ืืงืืืฅ ืืืงืืจื ืืฉื ืืืฉ ืื ืฉืืืงืืจ ืื ืืื
-ืืืืืื. ืืฉื ืืืืฉ ื ืืฆืจ ืข"ื ืืืกืคืช "~" ืืกืืฃ ืืฉื ืืืงืืจื ืฉื ืืงืืืฅ.
+ืืืืืื. ืืฉื ืืืืฉ ื ืืฆืจ ืขืดื ืืืกืคืช "~" ืืกืืฃ ืืฉื ืืืงืืจื ืฉื ืืงืืืฅ.
ืืฉืืฉืืืจื ืืกืชืืืืช, Emacs ืืฆืื ืืฉืืจื ืืชืืชืื ื ืืช ืฉื ืืงืืืฅ ืฉื ืฉืืจ. ื ืกื
ืืฉืืืจ ืืขืชืื ืืืืื ืืช ืขืึพืื ืช ืืืืื ืข ืืืืื ืืืชืจ ืืื ืืืขืืืื ืฉืืื ืื ืืืืฉื
@@ -489,7 +489,7 @@ Emacs ืืืฆืืจ ืืช ืืงืืืฅ ืขื ืืืงืกื ืฉืืงืฉืชื. ืืืืชื ืจืืข
--------
ืื ืชืคืชืื ืงืืืฅ ื ืืกืฃ ืขื C-x C-f, ืืงืืืฅ ืืจืืฉืื ืขืืืื ื ืฉืืจ ืคืชืื ืึพEmacs.
-ืชืืืื ืืืืืจ ืืืื ืข"ื C-x C-f. ืื ืชืืืื ืืคืชืื ืืกืคืจ ืจื ืฉื ืงืืฆืื.
+ืชืืืื ืืืืืจ ืืืื ืขืดื C-x C-f. ืื ืชืืืื ืืคืชืื ืืกืคืจ ืจื ืฉื ืงืืฆืื.
โEmacs ืืืืืง ืื ืงืืืฅ ืืชืื ืืืฉืืช ืืฉื "ืืืฆืฅ" ("buffer"). ืคืชืืืช ืงืืืฅ ืืืฆืจืช
ืืืฆืฅ ืืืฉ ืืชืื Emacs. ืืื ืืจืืืช ืืช ืจืฉืืืช ืืืืฆืฆืื ืืงืืืืื ืืชืื Emacs,
@@ -508,19 +508,19 @@ Emacs ืืืฆืืจ ืืช ืืงืืืฅ ืขื ืืืงืกื ืฉืืงืฉืชื. ืืืืชื ืจืืข
ืืฉืงืืืืื ืืกืคืจ ืืืฆืฆืื, ืจืง ืืื ืืื ืืืื ืืืืืช ืืืืฆืฅ "ืื ืืืื" ืืื ืจืืข
ื ืชืื. ืืื ืืืืฆืฅ ืื ืืชื ืืืฆืขืื ืขืจืืื ืืืืชื ืจืืข. ืื ืืจืฆืื ืื ืืขืจืื ืืืฆืฅ
ืืืจ, ืขืืืื "ืืขืืืจ" ืืืฆืฅ. ืขืืืจ ืืืฆืฆืื ืฉืืชืืืืื ืืงืืฆืื, ื ืืชื ืืขืฉืืช ืืืช
-ืข"ื C-x C-f ืฉืืคืงืื ืืช ืืงืืืฅ ืืฉื ืืช. ืืื ืงืืืืช ืืจื ืคืฉืืื ืืืชืจ: ืฉืืืืฉ
+ืขืดื C-x C-f ืฉืืคืงืื ืืช ืืงืืืฅ ืืฉื ืืช. ืืื ืงืืืืช ืืจื ืคืฉืืื ืืืชืจ: ืฉืืืืฉ
ืืคืงืืื C-x b. ืคืงืืื ืื ืชืืืื ืืืชืื ืืืงืืฉ ืืช ืฉื ืืืืฆืฅ.
->> ื ืืฆืืจ ืขืชื ืงืืืฅ ืืฉื "foo" ืข"ื ืืงืฉืช C-x C-f foo <Return>โ.
+>> ื ืืฆืืจ ืขืชื ืงืืืฅ ืืฉื "foo" ืขืดื ืืงืฉืช C-x C-f foo <Return>โ.
ืขืชื ืืืจื ืืฉืืขืืจ ืื ืืขืืจืช C-x b TUTORIAL.he <Return>โ.
ืืจืื ืืืงืจืื ืฉื ืืืืฆืฅ ืืื ืืฉื ืืงืืืฅ (ืืื ืฉื ืืชืืงืื ืฉืื). ืืื ืืื ืื
-ืชืืื ืื. ืจืฉืืืช ืืืืฆืฆืื ืฉื ืืฆืจืช ืข"ื C-x C-b ืชืฆืื ืื ืืช ืฉื ืืืืฆืฅ ืืื ืืช
+ืชืืื ืื. ืจืฉืืืช ืืืืฆืฆืื ืฉื ืืฆืจืช ืขืดื C-x C-b ืชืฆืื ืื ืืช ืฉื ืืืืฆืฅ ืืื ืืช
ืฉื ืืงืืืฅ ืขืืืจ ืื ืืืืฆืฆืื ืืงืืืืื ืึพEmacs.
ืื ืืงืกื ืฉืืืฆื ืืืืื ืฉื Emacs ืืื ื ืชืืื ืืืง ืฉื ืืืฆืฅ ืืืฉืื. ืงืืืืื
ืืืฆืฆืื ืฉืืื ื ืงืฉืืจืื ืืฉืื ืงืืืฅ. ืืืืืื, ืืืืฆืฅ ืืฉื "*Buffer List*"
-ืืืืืืง ืืช ืจืฉืืืช ืืืืฆืฆืื ืฉื ืืฆืจื ืข"ื C-x C-b ืืื ื ืืฆืื ืฉืื ืงืืืฅ. ืื
+ืืืืืืง ืืช ืจืฉืืืช ืืืืฆืฆืื ืฉื ืืฆืจื ืขืดื C-x C-b ืืื ื ืืฆืื ืฉืื ืงืืืฅ. ืื
ืืืืฆืฅ ืื ืืืื ืฉืฉืื TUTORIAL.he ืื ืืื ืงืืืฅ ืขื ืฉืืงืฉืชื ืขื C-x C-s ืืื
ืืฉืืืจ ืืืชื ืืงืืืฅ.
@@ -545,18 +545,18 @@ C-x C-s. ืืื ืงืืืืช ืคืงืืื
>> ืืื ืืกื ืฉืืจื ืฉื ืืงืกื ืืืืจึพืื ืืงืืฉื C-x s.
ืืื ืฆืจืื ืืฉืืื ืืื ืืฉืืืจ ืืืฆืฅ ืืฉื TUTORIAL.he.
- ืืฉืืื ืืืืื ืข"ื ืืงืฉื ืขื "y".
+ ืืฉืืื ืืืืื ืขืดื ืืงืฉื ืขื "y".
* ืืจืืืช ืืืกืฃ ืืคืงืืืืช
--------------------
-ืืกืคืจ ืืคืงืืืืช ืึพEmacs ืืืื ืืืจืื ืืื ืฉื ืืชื ืืืคืขืื ืข"ื ืื ืชืื ืึพcontrol
+ืืกืคืจ ืืคืงืืืืช ืึพEmacs ืืืื ืืืจืื ืืื ืฉื ืืชื ืืืคืขืื ืขืดื ืื ืชืื ืึพcontrol
ืืึพmeta. ืืื ืืืชืืืจ ืขื ืืขืื ืื, Emacs ืืฉืชืืฉ ืืคืงืืืืช X ืืืจืืืืืช (eXtend)
ืืช ืืืกืฃ ืืคืงืืืืช ืืจืืื. ืคืงืืืืช ืืจืืื ืืื ืื ืฉืชืื:
โC-x ืืจืืืช ืชื. ืชื ืืืื ืฉืื ืืืจืื ืืฉืืื ืืช ืืคืงืืื.
- โM-x ืืจืืื ืข"ื ืฉื ืืคืงืืื. ืืืจืื ืื ืฉื ืืจืื ืฉื ืคืงืืื.
+ โM-x ืืจืืื ืขืดื ืฉื ืืคืงืืื. ืืืจืื ืื ืฉื ืืจืื ืฉื ืคืงืืื.
ืืขืืจืช ืฉืชื ืืื ื ืืชื ืืืคืขืื ืคืงืืืืช ืฉืืืืฉืืืช ืฉืืื ืืฉืชืืฉืื ืืขืชืื ืจืืืงืืช
ืืืชืจ ืืืฉืจ ืคืงืืืืช ืฉืืืืชื ืขื ืขืืฉืื. ืืื ืืื ืืืจ ืจืืืชื: C-x C-f ืืคืชืืืช
@@ -577,7 +577,7 @@ Emacs: ืืื ืืืืืจ ืืชืื ืืฉืืจืช ืืคืงืืืืช ืืืกืืกืืช ืฉื
ืชืฆืืจืื ืืืงืืฉ ืืช ืืคืงืืื "fg" ืื โช"%emacs"โฌ.
ืืจืืข ืื ืืื ืืืฉืชืืฉ ืึพC-x C-c ืืื ืืืฉืจ ืืชื ืขืืืืื ืืืชื ืชืง (log out).
-ืืืึพืื, ืชืฆืืจืื ืืืฉืชืืฉ ืื ืืื ืืฆืืช ืึพEmacs ืฉืืืคืขื ืข"ื ืชืืื ืืืช ืืืจืืช
+ืืืึพืื, ืชืฆืืจืื ืืืฉืชืืฉ ืื ืืื ืืฆืืช ืึพEmacs ืฉืืืคืขื ืขืดื ืชืืื ืืืช ืืืจืืช
ืืืื ืงืจืืืช ืืืืจ ืืืงืืจืื ื.
ืงืืืืืช ืคืงืืืืช C-x ืจืืืช ืืื. ืืืื ืจืฉืืืช ืืื ืฉืืืจ ืืืืชื:
@@ -591,17 +591,17 @@ Emacs: ืืื ืืืืืจ ืืชืื ืืฉืืจืช ืืคืงืืืืช ืืืกืืกืืช ืฉื
โC-x 1 ืืฉืืจ ืจืง ืืืื ืืื ืืืืง ืื ืืฉืืจ
โC-x u ืืื ืคืงืืื ืืืจืื ื
-ืืจืืื ืข"ื ืฉื ืืคืงืืื ืฉืืืืฉืืช ืขื ืคืงืืืืช ืขืื ืืืชืจ ื ืืืจืืช ืื ืคืงืืืืช
+ืืจืืื ืขืดื ืฉื ืืคืงืืื ืฉืืืืฉืืช ืขื ืคืงืืืืช ืขืื ืืืชืจ ื ืืืจืืช ืื ืคืงืืืืช
ืกืคืฆืืคืืืช ืจืง ืืืืคื ื ืคืขืืื (modes) ืืืืืืื. ืืืืื ืืื ืืื ืคืงืืื
replace-string (ืืืืฃ ืืืจืืืช) ืืฉืจ ืืืืืคื ืืืจืืืช ืืืช ืืืฉื ื ืืื ืืืืฆืฅ.
ืืืจื ืฉืชืงืืฉื M-x, โEmacs ืืฆืื M-x ืืชืืชืืช ืืชืฆืืื ืืืืื ืฉืชืงืืฉื ืืช ืฉื
ืืคืงืืื, ืืืงืจื ืื "replace-string". ืืกืคืืง ืฉืชืงืืฉื "repl s<TAB>โ" ืึพEmacs
ืืฉืืื ืืช ืืฉื ืืืื. (<TAB> ืืื ืืงืฉ Tab, ืืืจื ืืื ืชืืฆืื ืืืชื ืืขื ืืงืฉ
ืึพCapsLock ืื Shift, ืืื ืืงืฆื ืืฉืืืื ืฉื ืืืงืืืช.) ืกืืืื ืืช ืืื ืช ืืคืงืืื
-ืข"ื ืืงืฉืช <Return>.
+ืขืดื ืืงืฉืช <Return>.
ืืคืงืืื ืืืืืคืช ืืืจืืืช ืืงืืงื ืืฉื ื ืืจืืืื ืืื -- ืืืืจืืืช ืฉืชืืืืฃ ืืื ืฉืชืืืืฃ
-ืืืชื. ืกืืืื ืืงืฉื ืฉื ืื ืืืช ืืื ืข"ื <Return>.
+ืืืชื. ืกืืืื ืืงืฉื ืฉื ืื ืืืช ืืื ืขืดื <Return>.
>> ืืืืื ืืช ืืกืื ืฉืชื ืฉืืจืืช ืืชืืช ืืฉืืจื ืื.
ืขืชื ืืงืืฉื M-x repl s<Return>changed<Return>altered<Return>โ.
@@ -703,7 +703,7 @@ Auto Fill mode. ืืืฉืจ ืืืคื ืื ืืืคืขื, Emacs ืืืืืืืืช ืคืืช
ืืกืืื ืืืื ืื ืืืงืกื ืฉืืงืฉืชื ืืจืื ืืื ืืฉืืื ืฉืืจื ืืืช.
ืืืคืขืืช Auto Fill mode ืืฉ ืืืงืืฉ M-x auto-fill-mode <Return>โ. ืืืฉืจ ืืืคื
-ืื ืืืคืขื, ื ืืชื ืืืืื ืข"ื M-x auto-fill-mode <Return>โ. ืืืช ืืืืจืช, ืคืงืืื
+ืื ืืืคืขื, ื ืืชื ืืืืื ืขืดื M-x auto-fill-mode <Return>โ. ืืืช ืืืืจืช, ืคืงืืื
ืื ืืคืขืืื ืืช ืืืืคื ืืฉืืื ื ืคืขืื ืืืืืืช ืืืชื ืืฉืืื ืคืขืื. ืืคืขืืื ืื
ืงืืจืืื "ืืืชืื" -- ืืคืงืืื "ืืืชืืช" ืืช ืืืืคื.
@@ -717,7 +717,7 @@ Auto Fill mode. ืืืฉืจ ืืืคื ืื ืืืคืขื, Emacs ืืืืืืืืช ืคืืช
>> ืืงืืฉื C-x f ืขื ืืจืืืื ื ืฉื 20. (C-u 2 0 C-x f). ืืืจึพืื ืืงืืฉื ืืงืกื
ืืืฉืื ืืฉืืื ืื ืฉึพEmacs ืคืืชื ืฉืืจืืช ืืืฉืืช ืืืจื 20 ืชืืืื ืืื ืืืืชืจ.
- ืืืกืืฃ, ืืืืืจื ืืช ืืืืจืช ืืฉืืืืื ืึพ70 ืข"ื ืฉืืืืฉ ืืืืจ ืึพC-x f.
+ ืืืกืืฃ, ืืืืืจื ืืช ืืืืจืช ืืฉืืืืื ืึพ70 ืขืดื ืฉืืืืฉ ืืืืจ ืึพC-x f.
ืื ืขืจืืชื ืฉืื ืืืื ืืืืฆืข ืคืกืงื, Auto Fill mode ืื ืืืื ืฉืืจืืช ืืืืฉ ืืืืคื
ืืืืืืื.
@@ -766,7 +766,7 @@ Auto Fill mode. ืืืฉืจ ืืืคื ืื ืืืคืขื, Emacs ืืืืืืืืช ืคืืช
ื ืืฆื "ืกื". ืขืชื ืืงืืฉื <DEL>. ืึพ"ื" ื ืืืง ืืืืืจืืืช ืืืกืื ืืืืจ ืืืงืื ืื
ืืื ืืฆื ืืช "ืก" ืืจืืฉืื ื.
-ืื ืืืืื ืืืืคืืฉ ืชืคืขืืื ืคืงืืื ืืืฉืื ืข"ื ืืงืฉื ืขื ืืงืฉ ืชืื ืืืืฆื ืขื
+ืื ืืืืื ืืืืคืืฉ ืชืคืขืืื ืคืงืืื ืืืฉืื ืขืดื ืืงืฉื ืขื ืืงืฉ ืชืื ืืืืฆื ืขื
CONTROL ืื META, ืืืืคืืฉ ืืกืชืืื. (ืืื ืชืืืื ืืืฆืืื ืืืื ืื -- ืืื ืชืืืื
ืืืืืืื ืืขืช ืืืคืืฉ, ืืืืืืช C-s ืึพC-r.)
@@ -800,7 +800,7 @@ CONTROL ืื META, ืืืืคืืฉ ืืกืชืืื. (ืืื ืชืืืื ืืืฆืืื ื
ืืกืื ืืืืื ืืขืืืื ืืืฉืืจ ืืืงืื ืื ืืื ืืื ืืคื ืึพืื.
ืชืืืื ืืืืฉืื ืืืฉืชืืฉ ืึพC-x o ืืื ืืืื ืืื ืืืืื ืืช. "ืืืืื ืื ืืืจ", ืืืชื
-ืืืื ืื ืื ืื ืขืืจืืื ืืงืกื, ืืืืื ืข"ื ืกืื ืืืื ืฉืืืืื ืืืื ืฉืืื ืื
+ืืืื ืื ืื ืื ืขืืจืืื ืืงืกื, ืืืืื ืขืดื ืกืื ืืืื ืฉืืืืื ืืืื ืฉืืื ืื
ืืงืืืืื. ืืื ืืืืื ืืช ืืืืจืื ืืืงืื ืกืื ืืฉืืื; ืื ืืคืขืืชื ืืช Emacs ืขื ืฆื
ืืจืคื, ืืืงืื ืืกืื ืืืืื ืืช ืืืืจืื ืืืฆื ืืชืืื ืจืืงื ืฉืืื ื ืืืืืืช.
@@ -809,9 +809,9 @@ CONTROL ืื META, ืืืืคืืฉ ืืกืชืืื. (ืืื ืชืืืื ืืืฆืืื ื
ืื ืืืจ.
โC-M-v ืืื ืืืืื ืืืช ืฉื ืคืงืืืช CONTROL-META. ืื ืืืงืืืช ืฉืืื ืงืืื ืืงืฉ
-META (ืื Alt) ืืืืชื, ืชืืืื ืืืงืืฉ ืืช ืืคืงืืื ืข"ื ืืืืฆื ืืืืืงื ืฉื ืืงืฉื
+META (ืื Alt) ืืืืชื, ืชืืืื ืืืงืืฉ ืืช ืืคืงืืื ืขืดื ืืืืฆื ืืืืืงื ืฉื ืืงืฉื
CONTROL ืึพMETA ืื ืืื ืืื ืืืงืืฉ v. ืืกืืจ ืฉืื ืชืืืฆื ืขื CONTROL ืึพMETA
-ืืื ื ืืฉื ื ืื ืฉื ื ืืืงืฉืื ืืืื ืคืืขืืื ืข"ื ืฉืื ืื ืืชื ืืืืงืฉ ืืื ืืืชื.
+ืืื ื ืืฉื ื ืื ืฉื ื ืืืงืฉืื ืืืื ืคืืขืืื ืขืดื ืฉืื ืื ืืชื ืืืืงืฉ ืืื ืืืชื.
ืื ืืื ืืืงืืืช ืืงืฉ META ืืืืชื ืืืชื ืืฉืชืืฉืื ืึพ<ESC> ืืชืืืืฃ, ืืกืืจ ืื
ืืฉื ื: ืืืืืื ืืืงืืฉ <ESC> ืืจืง ืืืืจ ืืื CONTROL-v, ืืืืช ืืฉืื
@@ -854,8 +854,8 @@ CONTROL ืึพMETA ืื ืืื ืืื ืืืงืืฉ v. ืืกืืจ ืฉืื ืชืืืฆื ืข
>> ืืงืืฉื M-x delete-frame <Return>โ.
ืืชืื ืืช ืฉืื ืืงืฉืชื ืืช ืืคืงืืื ืชืืกืืจ ืืชืืขืื ืืืืกื.
-ืืืึพืื, ื ืืชื ืืกืืืจ ืชืื ืืช ืืืจื ืืจืืืื ืื ืชืืืช ืข"ื ืืชืฆืืื ืืืจืคืืช ืฉื
-ืืืขืจืืช ืฉืืื (ืืืจืึพืืื, ืข"ื ืืงืืงื ืขื ืืืคืชืืจ ืืืกืืื ืึพ"X" ืืคืื ื ืขืืืื ื
+ืืืึพืื, ื ืืชื ืืกืืืจ ืชืื ืืช ืืืจื ืืจืืืื ืื ืชืืืช ืขืดื ืืชืฆืืื ืืืจืคืืช ืฉื
+ืืืขืจืืช ืฉืืื (ืืืจืึพืืื, ืขืดื ืืงืืงื ืขื ืืืคืชืืจ ืืืกืืื ืึพ"X" ืืคืื ื ืขืืืื ื
ืฉื ืืชืื ืืช.) ืฉืื ืืืืข ืืื ื ืืืื ืืขืืืื ืืืฉืจ ืกืืืจืื ืชืื ืืช (ืื ืืืื).
ืืืืืข ืืื ืคืฉืื ืืืจื ืืืชืฆืืื, ืืื ื ืืชื ืืืืืจื ืืืืืจ ืืืชืจ.
@@ -863,7 +863,7 @@ CONTROL ืึพMETA ืื ืืื ืืื ืืืงืืฉ v. ืืกืืจ ืฉืื ืชืืืฆื ืข
* ืจืืืช ืขืจืืื ืจืงืืจืกืืืืืช
-----------------------
-ืืชืื ืืชืืงืืขื ืืืฆื ืฉืงืจืื "ืจืืช ืขืจืืื ืจืงืืจืกืืืืช". Emacs ืืฆืืื ืืืช ืข"ื
+ืืชืื ืืชืืงืืขื ืืืฆื ืฉืงืจืื "ืจืืช ืขืจืืื ืจืงืืจืกืืืืช". Emacs ืืฆืืื ืืืช ืขืดื
ืกืืืจืืื ืืจืืืขืื ืืฉืืจืช ืืกืืืืก ืืกืืื ืืฉื ืืืืคื ืืจืืฉื. ืืืฉื, ืืืฆื ืฉื
[(Fundamental)] ืืืงืื (Fundamental).
@@ -910,7 +910,7 @@ M-x help <Return>โ ืืชืืืืฃ.)
ืืฆืืื ืื ืื ืขืืฉืืช, ืืฉืืืช ืขืฉืืืื ืืฉืืฉ ืืชืืขืื ืืงืืฆืจ -- ืืกืคืืง ืืื ืืืืืืจ
ืืื ืืช ืืคืงืืืืช ืฉืืืืชื ืืขืืจ.
-ื ืืชื ืืฆืืื ืืืจื C-h c ืื ืคืงืืืืช ืฉืืืคืขืืืช ืข"ื ืกืืจืช ืืงืฉืื ืืืืจื ืืืื
+ื ืืชื ืืฆืืื ืืืจื C-h c ืื ืคืงืืืืช ืฉืืืคืขืืืช ืขืดื ืกืืจืช ืืงืฉืื ืืืืจื ืืืื
ืืืื, ืืืื C-x C-s ืื (ืื ืืื ืืงืฉ META ืื EDIT ืื ALT) โโ<ESC> v.
ืืงืืืช ืืืืข ืืคืืจื ืืืชืจ ืขื ืคืงืืื, ืืฉืชืืฉื ืืคืงืืื C-h k ืืืงืื C-h c.
@@ -934,7 +934,7 @@ M-x help <Return>โ ืืชืืืืฃ.)
โC-h a ืคืงืืืืช ืื ืืืข ืื ืืฉื ืืกืืืื. ืืงืืฉื ืืืืช ืืคืชื ืึพEmacs
ืืฆืื ืืช ืจืฉืืืช ืืคืงืืืืช ืฉืฉืืืชืืื ืืืืืืช ืืช ืืืืช ืืืคืชื.
- ืื ืืคืงืืืืช ืืืื ื ืืชื ืืช ืืืคืขืื ืข"ื META-x. ืขืืืจ ืืืง
+ ืื ืืคืงืืืืช ืืืื ื ืืชื ืืช ืืืคืขืื ืขืดื META-x. ืขืืืจ ืืืง
ืืืคืงืืืืช ืชืืฆื ืื ืกืืจืช ืืงืฉืื ืฉืืคืขืืื ืืช ืืคืงืืื.
>> ืืงืืฉื C-h a file <Return>โ.
@@ -960,9 +960,9 @@ find-file.
* ืขืื ืชืืื ืืช
------------
-ืชืืืื ืืืืื ืขืื ืขืึพืืืืืช Emacs ืข"ื ืงืจืืื ืืืืจืื ืืืฉืชืืฉ ืฉืื, ืื ืืกืคืจ
+ืชืืืื ืืืืื ืขืื ืขืึพืืืืืช Emacs ืขืดื ืงืจืืื ืืืืจืื ืืืฉืชืืฉ ืฉืื, ืื ืืกืคืจ
ืืืืคืก ืื ืืืืจืกื ืืงืืื ืช ืืชืื Emacs ืขืฆืื. (ืชืืืื ืืืืืข ืื ืืืืจืื ืืจื
-ืชืคืจืื Help ืื ืข"ื ืืงืฉื ืขื C-h r.) ืืืื ืฉืชื ืชืืื ืืช ืฉืืืืืื ืืืฆืื ืื
+ืชืคืจืื Help ืื ืขืดื ืืงืฉื ืขื C-h r.) ืืืื ืฉืชื ืชืืื ืืช ืฉืืืืืื ืืืฆืื ืื
ืืขืื ืืื ืื ืืฉืืื ืืฉืจ ืืืกืืช ืืงืฉืืช, ืึพdired ืฉืืืคืฉืจืช ืืืคืื ื ืื ืืงืืฆืื.
ืืฉืืื ืืื ืืจื ืืืืื ืข ืืืงืฉืืช ืืืืชืจืืช. ืืืฉื, ืื ืืจืฆืื ืื ืืขืืืจ ืืืืฆืฅ
@@ -991,7 +991,7 @@ find-file.
--------------
ืฉืืขืืจ ืื ืืื ื ืฆืืฆื ืฉื ืฉืืจื ืืจืืื ืฉื ืฉืืขืืจืื ืืฉืืืืฉ ืึพEmacs, ืืื ืืืืจืกื
-ืืจืืฉืื ื ืฉื ืืชืื ืข"ื Stuart Cracraft ืขืืืจ ืืืจืกืช ืึพEmacs ืืืงืืจืืช.
+ืืจืืฉืื ื ืฉื ืืชืื ืขืดื Stuart Cracraft ืขืืืจ ืืืจืกืช ืึพEmacs ืืืงืืจืืช.
ืืืจืกื ืื ืฉื ืืฉืืขืืจ ืืื ื ืืืง ืืืืืืช GNU Emacs. ืืื ืืืื ืช ืืืืืืืช ืืืฆืจืื
ืื ืืชื ืช ืืืขืชืงื ืืืคืฆืช ืขืืชืงืื ืืชื ืืื ืืกืืืืืื ืืืืงืื:
@@ -999,7 +999,7 @@ find-file.
Copyright (C) 2010-2015 Free Software Foundation, Inc.
โGNU Emacs ืืื ื ืชืื ื ืืคืฉืืช; ืืืืชืื ืืืคืืฆื ื\ืื ืืฉื ืืชื ืืืคืืฃ ืืชื ืื
-ืืจืฉืืื GNU General Public License, ืืคื ืฉืืื ืืืฆื ืืืืจ ืข"ื Free
+ืืจืฉืืื GNU General Public License, ืืคื ืฉืืื ืืืฆื ืืืืจ ืขืดื Free
Software Foundation, ืื ืืืจืกื 3 ืฉื ืืจืฉืืื, ืืื (ืืืืคืฆืื ืืฉืืืจื ืืื)
ืืื ืืจืกื ืืืืืจืช ืืืชืจ.
@@ -1012,7 +1012,7 @@ Software Foundation, ืื ืืืจืกื 3 ืฉื ืืจืฉืืื, ืืื (ืืืืคืฆืื
ืื ืื ืืืืื ืื ืืงืจืื ืืช ืืงืืืฅ COPYING ืืื ืืื ืืืืง ืขืืชืงืื ืฉื GNU Emacs
ืืืืจืืื. ืขืืจื ืื ื ืืืกื ืืช "ืืืขืืืช" ืขื ืชืืื ื ืฉืืื ื ืืื ืืืื ืืชืืื ื,
-ืืืืช ืข"ื ืฉืืืืฉ, ืืชืืื ืืฉืืชืืฃ ืฉื ืชืืื ื ืืืคืฉืืช!
+ืืืืช ืขืดื ืฉืืืืฉ, ืืชืืื ืืฉืืชืืฃ ืฉื ืชืืื ื ืืืคืฉืืช!
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f16d85..bf60d38 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-20 Eli Zaretskii <address@hidden>
+
+ * button.el (button-activate, push-button): Doc fix. (Bug#19628)
+
2015-01-13 Michael Albinus <address@hidden>
* filenotify.el (file-notify-descriptors, file-notify-handle-event):
diff --git a/lisp/button.el b/lisp/button.el
index 189a1c2..e7602dd 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -224,10 +224,10 @@ changes to a supertype are not reflected in its
subtypes)."
prop val))))
(defun button-activate (button &optional use-mouse-action)
- "Call BUTTON's action property.
-If USE-MOUSE-ACTION is non-nil, invoke the button's mouse-action
-instead of its normal action; if the button has no mouse-action,
-the normal action is used instead.
+ "Call BUTTON's `action' property.
+If USE-MOUSE-ACTION is non-nil, invoke the button's `mouse-action'
+property instead of `action'; if the button has no `mouse-action',
+the value of `action' is used instead.
The action can either be a marker or a function. If it's a
marker then goto it. Otherwise it it is a function then it is
@@ -429,11 +429,13 @@ instead of starting at the next button."
(defun push-button (&optional pos use-mouse-action)
"Perform the action specified by a button at location POS.
POS may be either a buffer position or a mouse-event. If
-USE-MOUSE-ACTION is non-nil, invoke the button's mouse-action
-instead of its normal action; if the button has no mouse-action,
-the normal action is used instead. The action may be either a
-function to call or a marker to display and is invoked using
-`button-activate' (which see).
+USE-MOUSE-ACTION is non-nil, invoke the button's `mouse-action'
+property instead of its `action' property; if the button has no
+`mouse-action', the value of `action' is used instead.
+
+The action in both cases may be either a function to call or a
+marker to display and is invoked using `button-activate' (which
+see).
POS defaults to point, except when `push-button' is invoked
interactively as the result of a mouse-event, in which case, the
diff --git a/src/ChangeLog b/src/ChangeLog
index 4a49b8b..5ced473 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-17 Eli Zaretskii <address@hidden>
+
+ * xdisp.c (produce_image_glyph): Fix display of images in R2L
+ screen lines: prepend the new glyph to the ones already there
+ instead of appending it.
+
2015-01-14 Eli Zaretskii <address@hidden>
* w32fns.c (w32_set_title_bar_text): New function, including
diff --git a/src/xdisp.c b/src/xdisp.c
index 8d15feb..18e27e7 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25611,6 +25611,15 @@ produce_image_glyph (struct it *it)
enum glyph_row_area area = it->area;
glyph = it->glyph_row->glyphs[area] + it->glyph_row->used[area];
+ if (it->glyph_row->reversed_p)
+ {
+ struct glyph *g;
+
+ /* Make room for the new glyph. */
+ for (g = glyph - 1; g >= it->glyph_row->glyphs[it->area]; g--)
+ g[1] = *g;
+ glyph = it->glyph_row->glyphs[it->area];
+ }
if (glyph < it->glyph_row->glyphs[area + 1])
{
glyph->charpos = CHARPOS (it->position);
- [Emacs-diffs] master d7a8981 05/19: Merge from origin/emacs-24, (continued)
- [Emacs-diffs] master d7a8981 05/19: Merge from origin/emacs-24, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 32a2c91 10/19: Merge from origin/emacs-24, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 358a8b3 12/19: Merge from origin/emacs-24, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 0b2014f 03/19: Merge from origin/emacs-24, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master e57f766 07/19: Merge from origin/emacs-24, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master b0edd7c 09/19: Merge from origin/emacs-24, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 85ca476 14/19: Merge from origin/emacs-24, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master f5ebe84 16/19: Merge from origin/emacs-24, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 028ddef 18/19: Cleanup lisp/ChangeLog, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 4d0108a 11/19: Merge from origin/emacs-24, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 294127e 13/19: Merge from origin/emacs-24,
Fabiแn Ezequiel Gallina <=
- [Emacs-diffs] master 5491fd1 19/19: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 33ab7ee 15/19: Merge from origin/emacs-24, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 8e9166c 01/19: Merge from origin/emacs-24, Fabiแn Ezequiel Gallina, 2015/01/27
- [Emacs-diffs] master 95a2cb2 17/19: Merge from origin/emacs-24, Fabiแn Ezequiel Gallina, 2015/01/27