diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 12:51:06 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-04-09 12:51:06 -0700 |
commit | 9f46df23a3d01f82a24f2a3dd8730f0263fa9fde (patch) | |
tree | e10467a42658a374d5cdb7bb25fc94016abdad7a /lisp/emacs-lisp/byte-opt.el | |
parent | b8df54ffbefc5ddf40ddcda68a2a682769c5833d (diff) | |
parent | a130c2afed5e7d5ec10efa1a57f4de2461a9c778 (diff) | |
download | emacs-9f46df23a3d01f82a24f2a3dd8730f0263fa9fde.tar.gz emacs-9f46df23a3d01f82a24f2a3dd8730f0263fa9fde.tar.bz2 emacs-9f46df23a3d01f82a24f2a3dd8730f0263fa9fde.zip |
Merge from trunk; add Bug#.
Diffstat (limited to 'lisp/emacs-lisp/byte-opt.el')
-rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 78ac29d89df..3b324a09659 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -1237,7 +1237,7 @@ string-to-multibyte tan truncate unibyte-char-to-multibyte upcase user-full-name - user-login-name user-original-login-name user-variable-p + user-login-name user-original-login-name custom-variable-p vconcat window-buffer window-dedicated-p window-edges window-height window-hscroll window-minibuffer-p window-width |