Mercurial > emacs

comparison lisp/term/mac-win.el @ 83542:2d56e13fd23d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-413 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-414 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-415 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-416 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-417 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-418 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-419 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-420 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-421 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-422 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-423 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-424 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-425 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-426 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-427 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-428 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-429 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-430 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-431 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-432 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-433 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-434 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-435 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-436 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-437 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-438 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-439 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-440 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-441 lisp/url/url-methods.el: Fix format error when http_proxy is empty string * emacs@sv.gnu.org/emacs--devo--0--patch-442 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-443 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-444 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-445 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-446 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-447 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-448 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-449 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-450 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-451 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-452 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-453 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-454 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-455 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-456 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-457 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-458 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-459 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-460 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-461 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-462 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-463 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-464 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-465 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-466 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-467 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-468 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-469 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-470 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-471 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-472 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-473 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-128 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-129 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-130 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-131 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-132 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-133 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-134 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-135 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-136 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-137 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-138 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-139 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-140 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-141 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-142 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-143 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-144 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-145 Merge from emacs--devo--0 * emacs@sv.gnu.org/gnus--rel--5.10--patch-146 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-147 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-148 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-149 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-582
author Karoly Lorentey <lorentey@elte.hu>
date Sat, 14 Oct 2006 17:36:28 +0000
parents 694bbb62a75d ca1234ea6e5f
children 034f67f59091
comparison
equal deleted inserted replaced
83541:694bbb62a75d 83542:2d56e13fd23d
1285 (when (and (fboundp 'mac-code-convert-string) 1285 (when (and (fboundp 'mac-code-convert-string)
1286 (memq (coding-system-base coding-system) 1286 (memq (coding-system-base coding-system)
1287 (find-coding-systems-string string))) 1287 (find-coding-systems-string string)))
1288 (setq coding-system 1288 (setq coding-system
1289 (coding-system-change-eol-conversion coding-system 'mac)) 1289 (coding-system-change-eol-conversion coding-system 'mac))
1290 (when (and (eq system-type 'darwin) 1290 (let ((str string))
1291 (eq coding-system 'japanese-shift-jis-mac)) 1291 (when (and (eq system-type 'darwin)
1292 (setq encoding mac-text-encoding-mac-japanese-basic-variant) 1292 (eq coding-system 'japanese-shift-jis-mac))
1293 (setq string (subst-char-in-string ?\\ ?\x80 string)) 1293 (setq encoding mac-text-encoding-mac-japanese-basic-variant)
1294 (subst-char-in-string ?\¥ ?\x5c string t)) 1294 (setq str (subst-char-in-string ?\\ ?\x80 str))
1295 (setq data (mac-code-convert-string 1295 (subst-char-in-string ?\¥ ?\x5c str t)
1296 (encode-coding-string string coding-system) 1296 ;; ASCII-only?
1297 (or encoding coding-system) nil))) 1297 (if (string-match "\\`[\x00-\x7f]*\\'" str)
1298 (setq str nil)))
1299 (and str
1300 (setq data (mac-code-convert-string
1301 (encode-coding-string str coding-system)
1302 (or encoding coding-system) nil)))))
1298 (or data (encode-coding-string string (if (eq (byteorder) ?B) 1303 (or data (encode-coding-string string (if (eq (byteorder) ?B)
1299 'utf-16be-mac 1304 'utf-16be-mac
1300 'utf-16le-mac))))) 1305 'utf-16le-mac)))))
1301 1306
1302 (defun mac-TEXT-to-string (data &optional coding-system) 1307 (defun mac-TEXT-to-string (data &optional coding-system)
1526 (put 'core-event 'mac-apple-event-class "aevt") ; kCoreEventClass 1531 (put 'core-event 'mac-apple-event-class "aevt") ; kCoreEventClass
1527 (put 'internet-event 'mac-apple-event-class "GURL") ; kAEInternetEventClass 1532 (put 'internet-event 'mac-apple-event-class "GURL") ; kAEInternetEventClass
1528 1533
1529 ;;; Event IDs 1534 ;;; Event IDs
1530 ;; kCoreEventClass 1535 ;; kCoreEventClass
1531 (put 'open-application 'mac-apple-event-id "oapp") ; kAEOpenApplication 1536 (put 'open-application 'mac-apple-event-id "oapp") ; kAEOpenApplication
1532 (put 'reopen-application 'mac-apple-event-id "rapp") ; kAEReopenApplication 1537 (put 'reopen-application 'mac-apple-event-id "rapp") ; kAEReopenApplication
1533 (put 'open-documents 'mac-apple-event-id "odoc") ; kAEOpenDocuments 1538 (put 'open-documents 'mac-apple-event-id "odoc") ; kAEOpenDocuments
1534 (put 'print-documents 'mac-apple-event-id "pdoc") ; kAEPrintDocuments 1539 (put 'print-documents 'mac-apple-event-id "pdoc") ; kAEPrintDocuments
1535 (put 'open-contents 'mac-apple-event-id "ocon") ; kAEOpenContents 1540 (put 'open-contents 'mac-apple-event-id "ocon") ; kAEOpenContents
1536 (put 'quit-application 'mac-apple-event-id "quit") ; kAEQuitApplication 1541 (put 'quit-application 'mac-apple-event-id "quit") ; kAEQuitApplication
1537 (put 'application-died 'mac-apple-event-id "obit") ; kAEApplicationDied 1542 (put 'application-died 'mac-apple-event-id "obit") ; kAEApplicationDied
1538 (put 'show-preferences 'mac-apple-event-id "pref") ; kAEShowPreferences 1543 (put 'show-preferences 'mac-apple-event-id "pref") ; kAEShowPreferences
1539 (put 'autosave-now 'mac-apple-event-id "asav") ; kAEAutosaveNow 1544 (put 'autosave-now 'mac-apple-event-id "asav") ; kAEAutosaveNow
1540 ;; kAEInternetEventClass 1545 ;; kAEInternetEventClass
1541 (put 'get-url 'mac-apple-event-id "GURL") ; kAEGetURL 1546 (put 'get-url 'mac-apple-event-id "GURL") ; kAEGetURL
1542 ;; Converted HI command events 1547 ;; Converted HI command events
1543 (put 'about 'mac-apple-event-id "abou") ; kHICommandAbout 1548 (put 'about 'mac-apple-event-id "abou") ; kHICommandAbout
1549 (put 'show-hide-font-panel 'mac-apple-event-id "shfp") ; kHICommandShowHideFontPanel
1544 1550
1545 (defmacro mac-event-spec (event) 1551 (defmacro mac-event-spec (event)
1546 `(nth 1 ,event)) 1552 `(nth 1 ,event))
1547 1553
1548 (defmacro mac-event-ae (event) 1554 (defmacro mac-event-ae (event)
1794 ;; kEventClassFont/kEventFontPanelClosed 1800 ;; kEventClassFont/kEventFontPanelClosed
1795 (define-key mac-apple-event-map [font panel-closed] 1801 (define-key mac-apple-event-map [font panel-closed]
1796 'mac-handle-font-panel-closed) 1802 'mac-handle-font-panel-closed)
1797 ;; kEventClassFont/kEventFontSelection 1803 ;; kEventClassFont/kEventFontSelection
1798 (define-key mac-apple-event-map [font selection] 'mac-handle-font-selection) 1804 (define-key mac-apple-event-map [font selection] 'mac-handle-font-selection)
1805 (define-key mac-apple-event-map [hi-command show-hide-font-panel]
1806 'mac-font-panel-mode)
1799 1807
1800 (define-key-after menu-bar-showhide-menu [mac-font-panel-mode] 1808 (define-key-after menu-bar-showhide-menu [mac-font-panel-mode]
1801 (menu-bar-make-mm-toggle mac-font-panel-mode 1809 (menu-bar-make-mm-toggle mac-font-panel-mode
1802 "Font Panel" 1810 "Font Panel"
1803 "Show the font panel as a floating dialog") 1811 "Show the font panel as a floating dialog")