diff options
| author | Miles Bader | 2007-08-03 05:58:06 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-08-03 05:58:06 +0000 |
| commit | 2ca773ca40d2c1896757e6382aefff6d9de1c5cc (patch) | |
| tree | 846419ece5e5d8bc8f11e9786598678af9c78f00 /lisp/server.el | |
| parent | 49b23c2a404cf31fb1aeecc7932a7304aaf16a67 (diff) | |
| parent | 0896d93184a719bc994a3e699de27190aac0acb1 (diff) | |
| download | emacs-2ca773ca40d2c1896757e6382aefff6d9de1c5cc.tar.gz emacs-2ca773ca40d2c1896757e6382aefff6d9de1c5cc.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 843-845)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 84-87)
- Update from CVS
- Change capitalization of VC backend names for new backends
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-30
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lisp/server.el b/lisp/server.el index a9907f9d3a3..15bcaa3282f 100644 --- a/lisp/server.el +++ b/lisp/server.el | |||
| @@ -164,6 +164,7 @@ Only programs can do so." | |||
| 164 | :match (lambda (widget value) | 164 | :match (lambda (widget value) |
| 165 | (not (functionp value))) | 165 | (not (functionp value))) |
| 166 | nil) | 166 | nil) |
| 167 | (function-item :tag "Display in new frame" switch-to-buffer-other-frame) | ||
| 167 | (function-item :tag "Use pop-to-buffer" pop-to-buffer) | 168 | (function-item :tag "Use pop-to-buffer" pop-to-buffer) |
| 168 | (function :tag "Other function"))) | 169 | (function :tag "Other function"))) |
| 169 | 170 | ||