diff options
| author | Joakim Verona <joakim@verona.se> | 2016-01-15 20:06:45 +0100 |
|---|---|---|
| committer | Joakim Verona <joakim@verona.se> | 2016-01-15 20:06:45 +0100 |
| commit | 4b73dac2885aa7eb23b66c299065e19bd118a4fb (patch) | |
| tree | 18452b36b890faf52d40f555ebe4dc3c6e020bc6 /lisp/frame.el | |
| parent | 0d824cc5e79e7d29a01929a51dfd673a117c77e8 (diff) | |
| parent | 984a14904658da42ca9dea50a811a901ddc56e60 (diff) | |
| download | emacs-xwidget_mvp.tar.gz | |
merge masterxwidget_mvp
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 2584d09fb01..09738d1e2ed 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1,6 +1,6 @@ ;;; frame.el --- multi-frame management independent of window systems -*- lexical-binding:t -*- -;; Copyright (C) 1993-1994, 1996-1997, 2000-2015 Free Software +;; Copyright (C) 1993-1994, 1996-1997, 2000-2016 Free Software ;; Foundation, Inc. ;; Maintainer: emacs-devel@gnu.org @@ -2239,6 +2239,7 @@ See also `toggle-frame-maximized'." overline-margin line-prefix wrap-prefix + truncate-lines bidi-paragraph-direction bidi-display-reordering)) |