From: John Wiegley Date: Fri, 4 Mar 2016 07:53:08 +0000 (-0800) Subject: Merge from origin/emacs-25 X-Git-Tag: emacs-26.0.90~2390 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=692caf1e8d1657fbe4809294df6791c2879a7bb1;p=emacs.git Merge from origin/emacs-25 b13cab6 Add a eww command to toggle paragraph direction 4e46128 * nextstep/WISHLIST: Merge into etc/TODO and remove. 9e078e5 Fix char signedness issue in bidi code 064adf6 * lib-src/pop.c (socket_connection): Fix format string. 14060a9 Avoid inflooping in thing-at-point-looking-at 098d47b * lisp/emacs-lisp/derived.el (define-derived-mode): Revert indent change. b5db8e0 etc/PROBLEMS: Mention problems with using file descriptors ec10ef9 * lisp/apropos.el (apropos-variable): Doc fix. (Bug#22813). d2dd614 Remove unneeded workaround in xftfont.c 9b7593c ; * etc/NEWS: Reflect latest changes in saveplace. fde0cd1 * lisp/saveplace.el (save-place-local-mode): New minor mode 06a872b Fix redisplay on a TTY after 'make-frame' 95f5a43 Make double-click-1 work with unbalanced parens in CC Mode. Fixes bug#5560. 7d206fc Input method polish-slash should not use keyboard translation 8be32cf Fix an assertion 040e0d6 Fix 'toggle-save-place' 5244db2 * src/keyboard.c: Don't inadvertently set immediate_echo (bug#22581) --- 692caf1e8d1657fbe4809294df6791c2879a7bb1 diff --cc etc/NEWS index 8c7f4942ac5,8d8660526ed..8725049779d --- a/etc/NEWS +++ b/etc/NEWS @@@ -865,13 -709,10 +866,17 @@@ customize the `shr-use-colors' variable textual parts of a web page and display only that, leaving menus and the like off the page. + +++ + *** A new command `D' (`eww-toggle-paragraph-direction') allows you to + toggle the paragraph direction between left-to-right and right-to-left. + +--- +*** Images that are being loaded are now marked with grey +"placeholder" images of the size specified by the HTML. They are then +replaced by the real images asynchronously, which will also now +respect width/height HTML specs (unless they specify widths/heights +bigger than the current window). + --- *** You can now use several eww buffers in parallel by renaming eww buffers you want to keep separate. diff --cc lisp/net/eww.el index 3c3736ac376,886b4b9a503..d37b1b3261b --- a/lisp/net/eww.el +++ b/lisp/net/eww.el @@@ -698,10 -697,9 +707,11 @@@ the like. (define-key map "R" 'eww-readable) (define-key map "H" 'eww-list-histories) (define-key map "E" 'eww-set-character-encoding) + (define-key map "s" 'eww-switch-to-buffer) (define-key map "S" 'eww-list-buffers) (define-key map "F" 'eww-toggle-fonts) + (define-key map "D" 'eww-toggle-paragraph-direction) + (define-key map [(meta C)] 'eww-toggle-colors) (define-key map "b" 'eww-add-bookmark) (define-key map "B" 'eww-list-bookmarks) @@@ -727,9 -724,8 +737,10 @@@ ["Add bookmark" eww-add-bookmark t] ["List bookmarks" eww-list-bookmarks t] ["List cookies" url-cookie-list t] + ["Toggle fonts" eww-toggle-fonts t] + ["Toggle colors" eww-toggle-colors t] - ["Character Encoding" eww-set-character-encoding])) + ["Character Encoding" eww-set-character-encoding] + ["Toggle Paragraph Direction" eww-toggle-paragraph-direction])) map)) (defvar eww-tool-bar-map