diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:10 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-01-11 22:48:10 -0800 |
| commit | a8dd976aa5299060ee3670f8d693887960aa6ad8 (patch) | |
| tree | c805ea51cdf387c43e9aa2a99c502e7e44810418 /lisp/frame.el | |
| parent | 91b263e76f5ce170c1c8cbc34a2e7614c32612b8 (diff) | |
| parent | 9fb185aff7b1f36c30bd157ec446d9bad104d1ee (diff) | |
| download | emacs-a8dd976aa5299060ee3670f8d693887960aa6ad8.tar.gz emacs-a8dd976aa5299060ee3670f8d693887960aa6ad8.tar.bz2 emacs-a8dd976aa5299060ee3670f8d693887960aa6ad8.zip | |
Merge from origin/emacs-25
9fb185a shr-tag-video bug fix
6300655 Minor fixes in tramp-tests.el
50575b1 Ensure redisplay when 'truncate-lines' is set
0d9e80d Fix a doc string of 'transient-mark-mode'
0000ae5 MS-Windows followup to latest gnulib update
4bc5e02 Spelling fix
f1093f7 Do secure signed Bcc handling
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 04dd4abdf03..09738d1e2ed 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -2239,6 +2239,7 @@ See also `toggle-frame-maximized'." overline-margin line-prefix wrap-prefix + truncate-lines bidi-paragraph-direction bidi-display-reordering)) |