Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102123. ------------------------------------------------------------ revno: 102123 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-26 23:50:28 -0700 message: * abbrev.el (abbrev-mode): Remove one of the three definitions of this variable. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-27 06:48:04 +0000 +++ lisp/ChangeLog 2010-10-27 06:50:28 +0000 @@ -1,5 +1,8 @@ 2010-10-27 Glenn Morris + * abbrev.el (abbrev-mode): Remove one of the three definitions of this + variable. + * server.el (server-host, server-port, server-auth-dir): Autoload risky. * term/ns-win.el: Restore require of cl when compiling. === modified file 'lisp/abbrev.el' --- lisp/abbrev.el 2010-08-29 16:17:13 +0000 +++ lisp/abbrev.el 2010-10-27 06:50:28 +0000 @@ -1,7 +1,7 @@ ;;; abbrev.el --- abbrev mode commands for Emacs -;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004, 2005, +;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Maintainer: FSF ;; Keywords: abbrev convenience @@ -59,16 +59,6 @@ positive, otherwise turn it off. In Abbrev mode, inserting an abbreviation causes it to expand and be replaced by its expansion.") -(defcustom abbrev-mode nil - "Enable or disable Abbrev mode. -Non-nil means automatically expand abbrevs as they are inserted. - -Setting this variable with `setq' changes it for the current buffer. -Changing it with \\[customize] sets the default value. -Interactively, use the command `abbrev-mode' -to enable or disable Abbrev mode in the current buffer." - :type 'boolean - :group 'abbrev-mode) (put 'abbrev-mode 'safe-local-variable 'booleanp) @@ -927,5 +917,4 @@ (provide 'abbrev) -;; arch-tag: dbd6f3ae-dfe3-40ba-b00f-f9e3ff960df5 ;;; abbrev.el ends here ------------------------------------------------------------ revno: 102122 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-26 23:48:04 -0700 message: ns-win.el trivia. * term/ns-win.el: (ns-handle-nxopen): Optionally handle the temp-case. (ns-handle-nxopentemp): Just call ns-handle-nxopen. (ns-insert-file, ns-find-file): Use `pop'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-27 06:42:15 +0000 +++ lisp/ChangeLog 2010-10-27 06:48:04 +0000 @@ -4,6 +4,9 @@ * term/ns-win.el: Restore require of cl when compiling. (menu-bar-final-items): Remove non-existent `windows' menu. + (ns-handle-nxopen): Optionally handle the temp-case. + (ns-handle-nxopentemp): Just call ns-handle-nxopen. + (ns-insert-file, ns-find-file): Use `pop'. 2010-10-26 Glenn Morris === modified file 'lisp/term/ns-win.el' --- lisp/term/ns-win.el 2010-10-27 03:48:28 +0000 +++ lisp/term/ns-win.el 2010-10-27 06:48:04 +0000 @@ -47,7 +47,7 @@ (eval-when-compile (require 'cl)) ; lexical-let -;; Documentation-purposes only: actually loaded in loadup.el +;; Documentation-purposes only: actually loaded in loadup.el. (require 'frame) (require 'mouse) (require 'faces) @@ -66,14 +66,14 @@ ;; nsterm.m. (defvar ns-input-file) -(defun ns-handle-nxopen (switch) - (setq unread-command-events (append unread-command-events '(ns-open-file)) +(defun ns-handle-nxopen (switch &optional temp) + (setq unread-command-events (append unread-command-events + (if temp '(ns-open-temp-file) + '(ns-open-file))) ns-input-file (append ns-input-file (list (pop x-invocation-args))))) (defun ns-handle-nxopentemp (switch) - (setq unread-command-events (append unread-command-events - '(ns-open-temp-file)) - ns-input-file (append ns-input-file (list (pop x-invocation-args))))) + (ns-handle-nxopen switch t)) (defun ns-ignore-1-arg (switch) (setq x-invocation-args (cdr x-invocation-args))) @@ -154,7 +154,7 @@ (define-key global-map [kp-prior] 'scroll-down) (define-key global-map [kp-next] 'scroll-up) -;;; Allow shift-clicks to work similarly to under Nextstep +;; Allow shift-clicks to work similarly to under Nextstep. (define-key global-map [S-mouse-1] 'mouse-save-then-kill) (global-unset-key [S-down-mouse-1]) @@ -396,8 +396,7 @@ (let ((str (buffer-string))) (delete-region (point-min) (point-max)) (insert (ns-convert-utf8-nfd-to-nfc str)) - (- (point-max) (point-min)) - )))) + (- (point-max) (point-min)))))) (define-coding-system 'utf-8-nfd "UTF-8 NFD (decomposed) encoding." @@ -421,12 +420,11 @@ "Insert contents of file `ns-input-file' like insert-file but with less prompting. If file is a directory perform a `find-file' on it." (interactive) - (let ((f)) - (setq f (car ns-input-file)) - (setq ns-input-file (cdr ns-input-file)) + (let (f) + (setq f (pop ns-input-file)) (if (file-directory-p f) (find-file f) - (push-mark (+ (point) (car (cdr (insert-file-contents f)))))))) + (push-mark (+ (point) (cadr (insert-file-contents f))))))) (defvar ns-select-overlay nil "Overlay used to highlight areas in files requested by Nextstep apps.") @@ -479,7 +477,6 @@ (add-hook 'first-change-hook 'ns-unselect-line) - ;;;; Preferences handling. (declare-function ns-get-resource "nsfns.m" (owner name)) @@ -530,12 +527,11 @@ (defun ns-find-file () "Do a `find-file' with the `ns-input-file' as argument." (interactive) - (let ((f) (file) (bufwin1) (bufwin2)) - (setq f (file-truename (car ns-input-file))) - (setq ns-input-file (cdr ns-input-file)) - (setq file (find-file-noselect f)) - (setq bufwin1 (get-buffer-window file 'visible)) - (setq bufwin2 (get-buffer-window "*scratch*" 'visibile)) + (let (f file bufwin1 bufwin2) + (setq f (file-truename (pop ns-input-file)) + file (find-file-noselect f) + bufwin1 (get-buffer-window file 'visible) + bufwin2 (get-buffer-window "*scratch*" 'visibile)) (cond (bufwin1 (select-frame (window-frame bufwin1)) @@ -648,7 +644,6 @@ (error "Cancelled"))) (print-buffer))) - ;;;; Font support. ;; Needed for font listing functions under both backend and normal ------------------------------------------------------------ revno: 102121 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-26 23:42:15 -0700 message: * server.el (server-host, server-port, server-auth-dir): Autoload risky. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-27 03:48:28 +0000 +++ lisp/ChangeLog 2010-10-27 06:42:15 +0000 @@ -1,5 +1,7 @@ 2010-10-27 Glenn Morris + * server.el (server-host, server-port, server-auth-dir): Autoload risky. + * term/ns-win.el: Restore require of cl when compiling. (menu-bar-final-items): Remove non-existent `windows' menu. === modified file 'lisp/server.el' --- lisp/server.el 2010-10-26 07:40:07 +0000 +++ lisp/server.el 2010-10-27 06:42:15 +0000 @@ -110,16 +110,18 @@ (string :tag "Name or IP address") (const :tag "Local" nil)) :version "22.1") +;;;###autoload (put 'server-host 'risky-local-variable t) (defcustom server-port nil "The port number that the server process should listen on." :group 'server - :risky t :type '(choice (string :tag "Port number") (const :tag "Random" nil)) :version "24.1") +;;;###autoload +(put 'server-port 'risky-local-variable t) (defcustom server-auth-dir (locate-user-emacs-file "server/") "Directory for server authentication files. @@ -131,6 +133,7 @@ :group 'server :type 'directory :version "22.1") +;;;###autoload (put 'server-auth-dir 'risky-local-variable t) (defcustom server-raise-frame t @@ -1482,5 +1485,4 @@ (provide 'server) -;; arch-tag: 1f7ecb42-f00a-49f8-906d-61995d84c8d6 ;;; server.el ends here ------------------------------------------------------------ revno: 102120 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-10-27 03:59:59 +0000 message: mm-decode.el (mm-shr): Add undisplayer to MIME handle. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-27 01:09:11 +0000 +++ lisp/gnus/ChangeLog 2010-10-27 03:59:59 +0000 @@ -1,5 +1,7 @@ 2010-10-27 Katsumi Yamaoka + * mm-decode.el (mm-shr): Add undisplayer to MIME handle. + * gnus-group.el (gnus-group-completing-read) (gnus-read-ephemeral-bug-group): Replace replace-regexp-in-string with gnus-replace-in-string. === modified file 'lisp/gnus/mm-decode.el' --- lisp/gnus/mm-decode.el 2010-10-21 01:23:34 +0000 +++ lisp/gnus/mm-decode.el 2010-10-27 03:59:59 +0000 @@ -1712,7 +1712,13 @@ (mm-decode-coding-string (buffer-string) charset) (erase-buffer) (mm-enable-multibyte)))) - (libxml-parse-html-region (point-min) (point-max))))))) + (libxml-parse-html-region (point-min) (point-max)))) + (mm-handle-set-undisplayer + handle + `(lambda () + (let ((inhibit-read-only t)) + (delete-region ,(point-min-marker) + ,(point-max-marker)))))))) (provide 'mm-decode) ------------------------------------------------------------ revno: 102119 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-26 20:48:28 -0700 message: * lisp/term/ns-win.el: Restore require of cl when compiling. (menu-bar-final-items): Remove non-existent `windows' menu. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-26 16:56:11 +0000 +++ lisp/ChangeLog 2010-10-27 03:48:28 +0000 @@ -1,3 +1,8 @@ +2010-10-27 Glenn Morris + + * term/ns-win.el: Restore require of cl when compiling. + (menu-bar-final-items): Remove non-existent `windows' menu. + 2010-10-26 Glenn Morris * term/common-win.el (xw-defined-colors): Simplify the 'ns case. === modified file 'lisp/term/ns-win.el' --- lisp/term/ns-win.el 2010-10-26 13:20:00 +0000 +++ lisp/term/ns-win.el 2010-10-27 03:48:28 +0000 @@ -41,11 +41,12 @@ ;;; Code: - (or (featurep 'ns) (error "%s: Loading ns-win.el but not compiled for GNUstep/MacOS" (invocation-name))) +(eval-when-compile (require 'cl)) ; lexical-let + ;; Documentation-purposes only: actually loaded in loadup.el (require 'frame) (require 'mouse) @@ -57,10 +58,6 @@ "GNUstep/Mac OS X specific features." :group 'environment) -;; nsterm.m -(defvar ns-alternate-modifier) -(defvar ns-right-alternate-modifier) - ;;;; Command line argument handling. (defvar x-invocation-args) @@ -161,7 +158,6 @@ (define-key global-map [S-mouse-1] 'mouse-save-then-kill) (global-unset-key [S-down-mouse-1]) - ;; Special Nextstep-generated events are converted to function keys. Here ;; are the bindings for them. Note, these keys are actually declared in ;; x-setup-function-keys in common-win. @@ -196,10 +192,10 @@ (setq menu-bar-final-items (cond ((eq system-type 'darwin) - '(buffer windows services help-menu)) + '(buffer services help-menu)) ;; Otherwise, GNUstep. (t - '(buffer windows services hide-app quit)))) + '(buffer services hide-app quit)))) ;; Add standard top-level items to GNUstep menu. (unless (eq system-type 'darwin) @@ -295,10 +291,6 @@ (t (error (concat "Service " ns-input-spi-name " not recognized"))))) -;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; - - - ;; Composed key sequence handling for Nextstep system input methods. ;; (On Nextstep systems, input methods are provided for CJK ;; characters, etc. which require multiple keystrokes, and during @@ -395,29 +387,25 @@ ;;;; OS X file system Unicode UTF-8 NFD (decomposed form) support ;; Lisp code based on utf-8m.el, by Seiji Zenitani, Eiji Honjoh, and ;; Carsten Bormann. -(if (eq system-type 'darwin) - (progn - - (defun ns-utf8-nfd-post-read-conversion (length) - "Calls `ns-convert-utf8-nfd-to-nfc' to compose char sequences." - (save-excursion - (save-restriction - (narrow-to-region (point) (+ (point) length)) - (let ((str (buffer-string))) - (delete-region (point-min) (point-max)) - (insert (ns-convert-utf8-nfd-to-nfc str)) - (- (point-max) (point-min)) - )))) - - (define-coding-system 'utf-8-nfd - "UTF-8 NFD (decomposed) encoding." - :coding-type 'utf-8 - :mnemonic ?U - :charset-list '(unicode) - :post-read-conversion 'ns-utf8-nfd-post-read-conversion) - (set-file-name-coding-system 'utf-8-nfd))) - - +(when (eq system-type 'darwin) + (defun ns-utf8-nfd-post-read-conversion (length) + "Calls `ns-convert-utf8-nfd-to-nfc' to compose char sequences." + (save-excursion + (save-restriction + (narrow-to-region (point) (+ (point) length)) + (let ((str (buffer-string))) + (delete-region (point-min) (point-max)) + (insert (ns-convert-utf8-nfd-to-nfc str)) + (- (point-max) (point-min)) + )))) + + (define-coding-system 'utf-8-nfd + "UTF-8 NFD (decomposed) encoding." + :coding-type 'utf-8 + :mnemonic ?U + :charset-list '(unicode) + :post-read-conversion 'ns-utf8-nfd-post-read-conversion) + (set-file-name-coding-system 'utf-8-nfd)) ;;;; Inter-app communications support. @@ -492,7 +480,6 @@ (add-hook 'first-change-hook 'ns-unselect-line) - ;;;; Preferences handling. (declare-function ns-get-resource "nsfns.m" (owner name)) @@ -567,13 +554,15 @@ (ns-hide-emacs 'activate) (find-file f))))) - - ;;;; Frame-related functions. ;; Don't show the frame name; that's redundant with Nextstep. (setq-default mode-line-frame-identification '(" ")) +;; nsterm.m +(defvar ns-alternate-modifier) +(defvar ns-right-alternate-modifier) + ;; You say tomAYto, I say tomAHto.. (defvaralias 'ns-option-modifier 'ns-alternate-modifier) (defvaralias 'ns-right-option-modifier 'ns-right-alternate-modifier) @@ -640,10 +629,8 @@ (if (not tool-bar-mode) (tool-bar-mode t))) - ;;;; Dialog-related functions. - ;; Ask user for confirm before printing. Due to Kevin Rodgers. (defun ns-print-buffer () "Interactive front-end to `print-buffer': asks for user confirmation first." @@ -784,11 +771,9 @@ ;; buffer 0 before retrieving the value of the primary selection. (defun x-selection-value () (let (text) - ;; Consult the selection. Treat empty strings as if they were unset. (or text (setq text (ns-get-pasteboard))) (if (string= text "") (setq text nil)) - (cond ((not text) nil) ((eq text ns-last-selected-text) nil) @@ -809,7 +794,6 @@ (insert (ns-get-cut-buffer-internal 'SECONDARY))) - ;;;; Scrollbar handling. (global-set-key [vertical-scroll-bar down-mouse-1] 'ns-handle-scroll-bar-event) ------------------------------------------------------------ revno: 102118 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-10-27 01:09:11 +0000 message: gnus-group.el: Replace replace-regexp-in-string with gnus-replace-in-string. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-26 22:08:30 +0000 +++ lisp/gnus/ChangeLog 2010-10-27 01:09:11 +0000 @@ -1,3 +1,9 @@ +2010-10-27 Katsumi Yamaoka + + * gnus-group.el (gnus-group-completing-read) + (gnus-read-ephemeral-bug-group): Replace replace-regexp-in-string with + gnus-replace-in-string. + 2010-10-26 Katsumi Yamaoka * shr.el (shr-tag-div): Added. === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2010-10-24 09:55:56 +0000 +++ lisp/gnus/gnus-group.el 2010-10-27 01:09:11 +0000 @@ -2199,7 +2199,7 @@ (setq group (mm-encode-coding-string group (gnus-group-name-charset nil group)))) - (replace-regexp-in-string "\n" "" group))) + (gnus-replace-in-string group "\n" ""))) ;;;###autoload (defun gnus-fetch-group (group &optional articles) @@ -2429,9 +2429,9 @@ (while (re-search-forward "^To: " nil t) (end-of-line) (insert (format ", %s@%s" number - (replace-regexp-in-string - "/.*$" "" - (replace-regexp-in-string "^http://" "" mbox-url))))) + (gnus-replace-in-string + (gnus-replace-in-string mbox-url "^http://" "") + "/.*$" "")))) (write-region (point-min) (point-max) tmpfile) (gnus-group-read-ephemeral-group "gnus-read-ephemeral-bug" ------------------------------------------------------------ revno: 102117 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2010-10-27 00:23:09 +0200 message: * src/eval.c (init_eval_once): Set max_lisp_eval_depth to 600. Otherwise, bootstrapping on Windows fails to compile macroexp.el. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-26 18:47:19 +0000 +++ src/ChangeLog 2010-10-26 22:23:09 +0000 @@ -1,3 +1,8 @@ +2010-10-26 Juanma Barranquero + + * eval.c (init_eval_once): Set max_lisp_eval_depth to 600; + otherwise, bootstrapping on Windows fails to compile macroexp.el. + 2010-10-26 Eli Zaretskii * cmds.c (internal_self_insert): Don't insert if argument N is === modified file 'src/eval.c' --- src/eval.c 2010-09-30 14:28:22 +0000 +++ src/eval.c 2010-10-26 22:23:09 +0000 @@ -176,7 +176,7 @@ specpdl_ptr = specpdl; /* Don't forget to update docs (lispref node "Local Variables"). */ max_specpdl_size = 1000; - max_lisp_eval_depth = 500; + max_lisp_eval_depth = 600; Vrun_hooks = Qnil; } ------------------------------------------------------------ revno: 102116 committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2010-10-26 22:08:30 +0000 message: shr.el (shr-tag-div): Added. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-25 22:02:00 +0000 +++ lisp/gnus/ChangeLog 2010-10-26 22:08:30 +0000 @@ -1,3 +1,7 @@ +2010-10-26 Katsumi Yamaoka + + * shr.el (shr-tag-div): Added. + 2010-10-25 Julien Danjou * gnus-util.el: Remove `gnus-with-local-quit'. === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2010-10-24 09:55:56 +0000 +++ lisp/gnus/shr.el 2010-10-26 22:08:30 +0000 @@ -444,6 +444,12 @@ (shr-generic cont) (shr-ensure-paragraph)) +(defun shr-tag-div (cont) + (shr-ensure-newline) + (shr-indent) + (shr-generic cont) + (shr-ensure-newline)) + (defun shr-tag-b (cont) (shr-fontize-cont cont 'bold)) ------------------------------------------------------------ revno: 102115 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2010-10-26 20:47:19 +0200 message: cmds.c: (internal_self_insert): Don't insert for negative arguments. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-26 18:03:34 +0000 +++ src/ChangeLog 2010-10-26 18:47:19 +0000 @@ -1,7 +1,7 @@ 2010-10-26 Eli Zaretskii * cmds.c (internal_self_insert): Don't insert if argument N is - zero. (Bug#7281) + zero or negative. (Bug#7281) 2010-10-26 Jan Djärv === modified file 'src/cmds.c' --- src/cmds.c 2010-10-26 18:03:34 +0000 +++ src/cmds.c 2010-10-26 18:47:19 +0000 @@ -474,7 +474,7 @@ insert_and_inherit (strn, p - strn); SAFE_FREE (); } - else if (n) + else if (n > 0) insert_and_inherit (str, len); if ((CHAR_TABLE_P (Vauto_fill_chars) ------------------------------------------------------------ revno: 102114 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2010-10-26 20:03:34 +0200 message: Fix bug #7281. cmds.c (internal_self_insert): Don't insert if argument N is zero. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-26 06:09:54 +0000 +++ src/ChangeLog 2010-10-26 18:03:34 +0000 @@ -1,3 +1,8 @@ +2010-10-26 Eli Zaretskii + + * cmds.c (internal_self_insert): Don't insert if argument N is + zero. (Bug#7281) + 2010-10-26 Jan Djärv * gtkutil.c (qttip_cb): Set title to empty for ATK (Bug#7278). === modified file 'src/cmds.c' --- src/cmds.c 2010-10-19 15:43:27 +0000 +++ src/cmds.c 2010-10-26 18:03:34 +0000 @@ -453,7 +453,7 @@ && SINGLE_BYTE_CHAR_P (c)) ? UNIBYTE_TO_CHAR (c) : c); Lisp_Object string = Fmake_string (make_number (n), make_number (mc)); - + if (spaces_to_insert) { tem = Fmake_string (make_number (spaces_to_insert), @@ -474,7 +474,7 @@ insert_and_inherit (strn, p - strn); SAFE_FREE (); } - else + else if (n) insert_and_inherit (str, len); if ((CHAR_TABLE_P (Vauto_fill_chars) ------------------------------------------------------------ revno: 102113 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-26 09:56:11 -0700 message: * lisp/term/common-win.el (xw-defined-colors): Simplify the 'ns case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-26 13:20:00 +0000 +++ lisp/ChangeLog 2010-10-26 16:56:11 +0000 @@ -1,3 +1,7 @@ +2010-10-26 Glenn Morris + + * term/common-win.el (xw-defined-colors): Simplify the 'ns case. + 2010-10-26 Adrian Robert * term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to === modified file 'lisp/term/common-win.el' --- lisp/term/common-win.el 2010-10-26 13:20:00 +0000 +++ lisp/term/common-win.el 2010-10-26 16:56:11 +0000 @@ -463,15 +463,15 @@ (defun xw-defined-colors (&optional frame) "Internal function called by `defined-colors', which see." - (or frame (setq frame (selected-frame))) - ;; FIXME for ns, this is just... x-colors. - (let (defined-colors) - (dolist (this-color (if (eq system-type 'windows-nt) - (or (mapcar 'car w32-color-map) x-colors) - x-colors)) - (and (or (color-supported-p this-color frame t) - (featurep 'ns)) - (setq defined-colors (cons this-color defined-colors)))) - defined-colors)) + (if (featurep 'ns) + x-colors + (or frame (setq frame (selected-frame))) + (let (defined-colors) + (dolist (this-color (if (eq system-type 'windows-nt) + (or (mapcar 'car w32-color-map) x-colors) + x-colors)) + (and (color-supported-p this-color frame t) + (setq defined-colors (cons this-color defined-colors)))) + defined-colors))) ;;; common-win.el ends here ------------------------------------------------------------ revno: 102112 committer: Adrian Robert branch nick: trunk timestamp: Tue 2010-10-26 16:20:00 +0300 message: * term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to global map. * term/common-win.el (x-setup-function-keys): Remove most of the keymappings. Comment on the remaining ones. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-26 07:41:30 +0000 +++ lisp/ChangeLog 2010-10-26 13:20:00 +0000 @@ -1,3 +1,10 @@ +2010-10-26 Adrian Robert + + * term/ns-win.el (ns-new-frame, ns-show-prefs): Don't add to + global map. + * term/common-win.el (x-setup-function-keys): Remove most of the + keymappings. Comment on the remaining ones. + 2010-10-26 Peter Oliver (tiny change) * server.el (server-port): New option. (Bug#854) === modified file 'lisp/term/common-win.el' --- lisp/term/common-win.el 2010-10-26 03:58:19 +0000 +++ lisp/term/common-win.el 2010-10-26 13:20:00 +0000 @@ -113,6 +113,7 @@ interprogram-paste-function 'x-selection-value system-key-alist (list + ;; These are special "keys" used to pass events from C to lisp. (cons (logior (lsh 0 16) 1) 'ns-power-off) (cons (logior (lsh 0 16) 2) 'ns-open-file) (cons (logior (lsh 0 16) 3) 'ns-open-temp-file) @@ -124,100 +125,10 @@ ;;; (cons (logior (lsh 0 16) 9) 'ns-insert-working-text) ;;; (cons (logior (lsh 0 16) 10) 'ns-delete-working-text) (cons (logior (lsh 0 16) 11) 'ns-spi-service-call) - (cons (logior (lsh 0 16) 12) 'ns-new-frame) +;;; (cons (logior (lsh 0 16) 12) 'ns-new-frame) (cons (logior (lsh 0 16) 13) 'ns-toggle-toolbar) - (cons (logior (lsh 0 16) 14) 'ns-show-prefs) - (cons (logior (lsh 1 16) 32) 'f1) - (cons (logior (lsh 1 16) 33) 'f2) - (cons (logior (lsh 1 16) 34) 'f3) - (cons (logior (lsh 1 16) 35) 'f4) - (cons (logior (lsh 1 16) 36) 'f5) - (cons (logior (lsh 1 16) 37) 'f6) - (cons (logior (lsh 1 16) 38) 'f7) - (cons (logior (lsh 1 16) 39) 'f8) - (cons (logior (lsh 1 16) 40) 'f9) - (cons (logior (lsh 1 16) 41) 'f10) - (cons (logior (lsh 1 16) 42) 'f11) - (cons (logior (lsh 1 16) 43) 'f12) - (cons (logior (lsh 1 16) 44) 'kp-insert) - (cons (logior (lsh 1 16) 45) 'kp-delete) - (cons (logior (lsh 1 16) 46) 'kp-home) - (cons (logior (lsh 1 16) 47) 'kp-end) - (cons (logior (lsh 1 16) 48) 'kp-prior) - (cons (logior (lsh 1 16) 49) 'kp-next) - (cons (logior (lsh 1 16) 50) 'print-screen) - (cons (logior (lsh 1 16) 51) 'scroll-lock) - (cons (logior (lsh 1 16) 52) 'pause) - (cons (logior (lsh 1 16) 53) 'system) - (cons (logior (lsh 1 16) 54) 'break) - ;; Erm, this looks like a FIXME... - (cons (logior (lsh 1 16) 56) - 'please-tell-carl-what-this-key-is-called-56) - (cons (logior (lsh 1 16) 61) - 'please-tell-carl-what-this-key-is-called-61) - (cons (logior (lsh 1 16) 62) - 'please-tell-carl-what-this-key-is-called-62) - (cons (logior (lsh 1 16) 63) - 'please-tell-carl-what-this-key-is-called-63) - (cons (logior (lsh 1 16) 64) - 'please-tell-carl-what-this-key-is-called-64) - (cons (logior (lsh 1 16) 69) - 'please-tell-carl-what-this-key-is-called-69) - (cons (logior (lsh 1 16) 70) - 'please-tell-carl-what-this-key-is-called-70) - (cons (logior (lsh 1 16) 71) - 'please-tell-carl-what-this-key-is-called-71) - (cons (logior (lsh 1 16) 72) - 'please-tell-carl-what-this-key-is-called-72) - (cons (logior (lsh 1 16) 73) - 'please-tell-carl-what-this-key-is-called-73) - (cons (logior (lsh 2 16) 3) 'kp-enter) - (cons (logior (lsh 2 16) 9) 'kp-tab) - (cons (logior (lsh 2 16) 28) 'kp-quit) - (cons (logior (lsh 2 16) 35) 'kp-hash) - (cons (logior (lsh 2 16) 42) 'kp-multiply) - (cons (logior (lsh 2 16) 43) 'kp-add) - (cons (logior (lsh 2 16) 44) 'kp-separator) - (cons (logior (lsh 2 16) 45) 'kp-subtract) - (cons (logior (lsh 2 16) 46) 'kp-decimal) - (cons (logior (lsh 2 16) 47) 'kp-divide) - (cons (logior (lsh 2 16) 48) 'kp-0) - (cons (logior (lsh 2 16) 49) 'kp-1) - (cons (logior (lsh 2 16) 50) 'kp-2) - (cons (logior (lsh 2 16) 51) 'kp-3) - (cons (logior (lsh 2 16) 52) 'kp-4) - (cons (logior (lsh 2 16) 53) 'kp-5) - (cons (logior (lsh 2 16) 54) 'kp-6) - (cons (logior (lsh 2 16) 55) 'kp-7) - (cons (logior (lsh 2 16) 56) 'kp-8) - (cons (logior (lsh 2 16) 57) 'kp-9) - (cons (logior (lsh 2 16) 60) 'kp-less) - (cons (logior (lsh 2 16) 61) 'kp-equal) - (cons (logior (lsh 2 16) 62) 'kp-more) - (cons (logior (lsh 2 16) 64) 'kp-at) - (cons (logior (lsh 2 16) 92) 'kp-backslash) - (cons (logior (lsh 2 16) 96) 'kp-backtick) - (cons (logior (lsh 2 16) 124) 'kp-bar) - (cons (logior (lsh 2 16) 126) 'kp-tilde) - (cons (logior (lsh 2 16) 157) 'kp-mu) - (cons (logior (lsh 2 16) 165) 'kp-yen) - (cons (logior (lsh 2 16) 167) 'kp-paragraph) - (cons (logior (lsh 2 16) 172) 'left) - (cons (logior (lsh 2 16) 173) 'up) - (cons (logior (lsh 2 16) 174) 'right) - (cons (logior (lsh 2 16) 175) 'down) - (cons (logior (lsh 2 16) 176) 'kp-ring) - (cons (logior (lsh 2 16) 201) 'kp-square) - (cons (logior (lsh 2 16) 204) 'kp-cube) - (cons (logior (lsh 3 16) 8) 'backspace) - (cons (logior (lsh 3 16) 9) 'tab) - (cons (logior (lsh 3 16) 10) 'linefeed) - (cons (logior (lsh 3 16) 11) 'clear) - (cons (logior (lsh 3 16) 13) 'return) - (cons (logior (lsh 3 16) 18) 'pause) - (cons (logior (lsh 3 16) 25) 'S-tab) - (cons (logior (lsh 3 16) 27) 'escape) - (cons (logior (lsh 3 16) 127) 'delete))))) +;;; (cons (logior (lsh 0 16) 14) 'ns-show-prefs) + )))) (set-terminal-parameter frame 'x-setup-function-keys t))) (defvar x-invocation-args) === modified file 'lisp/term/ns-win.el' --- lisp/term/ns-win.el 2010-10-26 06:48:17 +0000 +++ lisp/term/ns-win.el 2010-10-26 13:20:00 +0000 @@ -163,7 +163,8 @@ ;; Special Nextstep-generated events are converted to function keys. Here -;; are the bindings for them. +;; are the bindings for them. Note, these keys are actually declared in +;; x-setup-function-keys in common-win. (define-key global-map [ns-power-off] 'save-buffers-kill-emacs) (define-key global-map [ns-open-file] 'ns-find-file) (define-key global-map [ns-open-temp-file] [ns-open-file]) @@ -174,9 +175,7 @@ (define-key global-map [ns-change-font] 'ns-respond-to-change-font) (define-key global-map [ns-open-file-line] 'ns-open-file-select-line) (define-key global-map [ns-spi-service-call] 'ns-spi-service-call) -(define-key global-map [ns-new-frame] 'make-frame) (define-key global-map [ns-toggle-toolbar] 'ns-toggle-toolbar) -(define-key global-map [ns-show-prefs] 'customize) ;; Set up a number of aliases and other layers to pretend we're using ------------------------------------------------------------ revno: 102111 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-26 00:42:46 -0700 message: Mention server-port. diff: === modified file 'etc/NEWS' --- etc/NEWS 2010-10-24 18:43:31 +0000 +++ etc/NEWS 2010-10-26 07:42:46 +0000 @@ -329,6 +329,8 @@ ** mpc.el: Can use pseudo tags of the form tag1|tag2 as a union of two tags. +** server can listen on a specific port using the server-port option. + ** Calendar, Diary, and Appt --- ------------------------------------------------------------ revno: 102110 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-26 00:41:30 -0700 message: Add ChangeLog bug ref. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-26 07:40:07 +0000 +++ lisp/ChangeLog 2010-10-26 07:41:30 +0000 @@ -1,6 +1,6 @@ 2010-10-26 Peter Oliver (tiny change) - * server.el (server-port): New option. + * server.el (server-port): New option. (Bug#854) (server-start): Use server-port. 2010-10-26 Glenn Morris ------------------------------------------------------------ revno: 102109 author: Peter Oliver committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-26 00:40:07 -0700 message: Add server-port option. (Bug#854) * lisp/server.el (server-port): New option. (server-start): Use server-port. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-26 03:58:19 +0000 +++ lisp/ChangeLog 2010-10-26 07:40:07 +0000 @@ -1,3 +1,8 @@ +2010-10-26 Peter Oliver (tiny change) + + * server.el (server-port): New option. + (server-start): Use server-port. + 2010-10-26 Glenn Morris * term/ns-win.el (ns-version-string): Remove unused declaration. === modified file 'lisp/server.el' --- lisp/server.el 2010-10-08 10:14:47 +0000 +++ lisp/server.el 2010-10-26 07:40:07 +0000 @@ -112,6 +112,15 @@ :version "22.1") (put 'server-host 'risky-local-variable t) +(defcustom server-port nil + "The port number that the server process should listen on." + :group 'server + :risky t + :type '(choice + (string :tag "Port number") + (const :tag "Random" nil)) + :version "24.1") + (defcustom server-auth-dir (locate-user-emacs-file "server/") "Directory for server authentication files. @@ -564,7 +573,7 @@ ;; The other args depend on the kind of socket used. (if server-use-tcp (list :family 'ipv4 ;; We're not ready for IPv6 yet - :service t + :service (or server-port t) :host (or server-host 'local) :plist '(:authenticated nil)) (list :family 'local ------------------------------------------------------------ revno: 102108 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-10-25 23:48:17 -0700 message: * lisp/term/ns-win.el (ns-ignore-2-arg): Remove unused function. (Mistakenly committed the ChangeLog for this earlier.) diff: === modified file 'lisp/term/ns-win.el' --- lisp/term/ns-win.el 2010-10-26 03:58:19 +0000 +++ lisp/term/ns-win.el 2010-10-26 06:48:17 +0000 @@ -80,8 +80,6 @@ (defun ns-ignore-1-arg (switch) (setq x-invocation-args (cdr x-invocation-args))) -(defun ns-ignore-2-arg (switch) ; FIXME unused? - (setq x-invocation-args (cddr x-invocation-args))) (defun ns-parse-geometry (geom) "Parse a Nextstep-style geometry string GEOM.