emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master e3e1cd7 1/5: Merge from origin/emacs-27


From: Glenn Morris
Subject: master e3e1cd7 1/5: Merge from origin/emacs-27
Date: Fri, 13 Nov 2020 12:00:38 -0500 (EST)

branch: master
commit e3e1cd733efe919d20d4273250372f0dd74c9a10
Merge: 7970610 75384bd
Author: Glenn Morris <rgm@gnu.org>
Commit: Glenn Morris <rgm@gnu.org>

    Merge from origin/emacs-27
    
    75384bd155 Update the doc-view header line
    13ab70c80e Avoid breaking Arabic shaping in 'window-text-pixel-size'
    e693d97e50 doc-view.el comment clarification
    968e85a2ce Update erc documentation about C-c C-b
---
 doc/misc/erc.texi |  4 ++--
 lisp/doc-view.el  | 11 ++++++-----
 src/xdisp.c       | 11 +++++++++--
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/doc/misc/erc.texi b/doc/misc/erc.texi
index cb2e832..c39d2f9 100644
--- a/doc/misc/erc.texi
+++ b/doc/misc/erc.texi
@@ -284,8 +284,8 @@ Complete the given word, using ispell.
 @item C-c C-a (@code{erc-bol})
 Go to beginning of line or end of prompt.
 
-@item C-c C-b (@code{erc-iswitchb})
-Use @code{iswitchb-read-buffer} to prompt for a ERC buffer to switch to.
+@item C-c C-b (@code{erc-switch-to-buffer})
+Use @code{read-buffer} to prompt for a ERC buffer to switch to.
 
 @item C-c C-c (@code{erc-toggle-interpret-controls})
 Toggle interpretation of control sequences in messages.
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 02d8965..73483b2 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -1,4 +1,4 @@
-;;; doc-view.el --- View PDF/PostScript/DVI files in Emacs -*- 
lexical-binding: t -*-
+;;; doc-view.el --- Document viewer for Emacs -*- lexical-binding: t -*-
 
 ;; Copyright (C) 2007-2020 Free Software Foundation, Inc.
 ;;
@@ -29,10 +29,11 @@
 
 ;;; Commentary:
 
-;; DocView is a document viewer for Emacs.  It converts PDF, PS and DVI files
-;; to a set of PNG files, one PNG for each page, and displays the PNG images
-;; inside an Emacs buffer.  This buffer uses `doc-view-mode' which provides
-;; convenient key bindings for browsing the document.
+;; DocView is a document viewer for Emacs.  It converts a number of
+;; document formats (including PDF, PS, DVI, Djvu and ODF files) to a
+;; set of PNG files, one PNG for each page, and displays the PNG
+;; images inside an Emacs buffer.  This buffer uses `doc-view-mode'
+;; which provides convenient key bindings for browsing the document.
 ;;
 ;; To use it simply open a document file with
 ;;
diff --git a/src/xdisp.c b/src/xdisp.c
index 0001bcd..32486ea 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7323,14 +7323,21 @@ static next_element_function const 
get_next_element[NUM_IT_METHODS] =
 
 
 /* Return true iff a character at CHARPOS (and BYTEPOS) is composed
-   (possibly with the following characters).  */
+   (possibly with the following characters).
+
+  Note: we pass -1 as the "resolved bidi level" when the iterator
+  doesn't have the bidi_p flag set, because in that case we really
+  don't know what is the directionality of the text, so we leave it to
+  the shaping engine to figure that out.  */
 
 #define CHAR_COMPOSED_P(IT,CHARPOS,BYTEPOS,END_CHARPOS)                        
\
   ((IT)->cmp_it.id >= 0                                                        
\
    || ((IT)->cmp_it.stop_pos == (CHARPOS)                              \
        && composition_reseat_it (&(IT)->cmp_it, CHARPOS, BYTEPOS,      \
                                 END_CHARPOS, (IT)->w,                  \
-                                (IT)->bidi_it.resolved_level,          \
+                                (IT)->bidi_p                           \
+                                ? (IT)->bidi_it.resolved_level         \
+                                : -1,                                  \
                                 FACE_FROM_ID_OR_NULL ((IT)->f,         \
                                                       (IT)->face_id),  \
                                 (IT)->string)))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]