Mercurial > emacs
diff lisp/term/x-win.el @ 91327:606f2d163a64
Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-312
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 09 Jan 2008 01:21:15 +0000 |
| parents | 56a72e2bd635 107ccd98fa12 |
| children | 60f09344e8c9 |
line wrap: on
line diff
--- a/lisp/term/x-win.el Tue Jan 08 05:34:24 2008 +0000 +++ b/lisp/term/x-win.el Wed Jan 09 01:21:15 2008 +0000 @@ -1,7 +1,7 @@ ;;; x-win.el --- parse relevant switches and set up for X -*-coding: iso-2022-7bit;-*- ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, -;; 2005, 2006, 2007 Free Software Foundation, Inc. +;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. ;; Author: FSF ;; Keywords: terminals, i18n @@ -1228,30 +1228,7 @@ "Return the appropriate value of `system-key-alist' for VENDOR. VENDOR is a string containing the name of the X Server's vendor, as returned by `x-server-vendor'." - ;; Fixme: Drop Apollo now? - (cond ((string-equal vendor "Apollo Computer Inc.") - '((65280 . linedel) - (65281 . chardel) - (65282 . copy) - (65283 . cut) - (65284 . paste) - (65285 . move) - (65286 . grow) - (65287 . cmd) - (65288 . shell) - (65289 . leftbar) - (65290 . rightbar) - (65291 . leftbox) - (65292 . rightbox) - (65293 . upbox) - (65294 . downbox) - (65295 . pop) - (65296 . read) - (65297 . edit) - (65298 . save) - (65299 . exit) - (65300 . repeat))) - ((or (string-equal vendor "Hewlett-Packard Incorporated") + (cond ((or (string-equal vendor "Hewlett-Packard Incorporated") (string-equal vendor "Hewlett-Packard Company")) '(( 168 . mute-acute) ( 169 . mute-grave)