[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r102119: * lisp/term/ns-win.el: Resto
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r102119: * lisp/term/ns-win.el: Restore require of cl when compiling. |
Date: |
Tue, 26 Oct 2010 20:48:28 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 102119
committer: Glenn Morris <address@hidden>
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.
modified:
lisp/ChangeLog
lisp/term/ns-win.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2010-10-26 16:56:11 +0000
+++ b/lisp/ChangeLog 2010-10-27 03:48:28 +0000
@@ -1,3 +1,8 @@
+2010-10-27 Glenn Morris <address@hidden>
+
+ * term/ns-win.el: Restore require of cl when compiling.
+ (menu-bar-final-items): Remove non-existent `windows' menu.
+
2010-10-26 Glenn Morris <address@hidden>
* term/common-win.el (xw-defined-colors): Simplify the 'ns case.
=== modified file 'lisp/term/ns-win.el'
--- a/lisp/term/ns-win.el 2010-10-26 13:20:00 +0000
+++ b/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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r102119: * lisp/term/ns-win.el: Restore require of cl when compiling.,
Glenn Morris <=