Skip to content

Commit 24d30cd

Browse files
committed
arc-mode.el: Remove XEmacs compat code
* lisp/arc-mode.el (archive-mode-map): Remove XEmacs compat code. (archive-summarize-files): Ditto.
1 parent d4af2f3 commit 24d30cd

File tree

1 file changed

+65
-71
lines changed

1 file changed

+65
-71
lines changed

lisp/arc-mode.el

Lines changed: 65 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -417,70 +417,66 @@ file. Archive and member name will be added."
417417
(substitute-key-definition 'advertised-undo 'archive-undo map global-map)
418418
(substitute-key-definition 'undo 'archive-undo map global-map))
419419

420-
(define-key map
421-
(if (featurep 'xemacs) 'button2 [mouse-2]) 'archive-extract)
422-
423-
(if (featurep 'xemacs)
424-
() ; out of luck
425-
426-
(define-key map [menu-bar immediate]
427-
(cons "Immediate" (make-sparse-keymap "Immediate")))
428-
(define-key map [menu-bar immediate alternate]
429-
'(menu-item "Alternate Display" archive-alternate-display
430-
:enable (boundp (archive-name "alternate-display"))
431-
:help "Toggle alternate file info display"))
432-
(define-key map [menu-bar immediate view]
433-
'(menu-item "View This File" archive-view
434-
:help "Display file at cursor in View Mode"))
435-
(define-key map [menu-bar immediate display]
436-
'(menu-item "Display in Other Window" archive-display-other-window
437-
:help "Display file at cursor in another window"))
438-
(define-key map [menu-bar immediate find-file-other-window]
439-
'(menu-item "Find in Other Window" archive-extract-other-window
440-
:help "Edit file at cursor in another window"))
441-
(define-key map [menu-bar immediate find-file]
442-
'(menu-item "Find This File" archive-extract
443-
:help "Extract file at cursor and edit it"))
444-
445-
(define-key map [menu-bar mark]
446-
(cons "Mark" (make-sparse-keymap "Mark")))
447-
(define-key map [menu-bar mark unmark-all]
448-
'(menu-item "Unmark All" archive-unmark-all-files
449-
:help "Unmark all marked files"))
450-
(define-key map [menu-bar mark deletion]
451-
'(menu-item "Flag" archive-flag-deleted
452-
:help "Flag file at cursor for deletion"))
453-
(define-key map [menu-bar mark unmark]
454-
'(menu-item "Unflag" archive-unflag
455-
:help "Unmark file at cursor"))
456-
(define-key map [menu-bar mark mark]
457-
'(menu-item "Mark" archive-mark
458-
:help "Mark file at cursor"))
459-
460-
(define-key map [menu-bar operate]
461-
(cons "Operate" (make-sparse-keymap "Operate")))
462-
(define-key map [menu-bar operate chown]
463-
'(menu-item "Change Owner..." archive-chown-entry
464-
:enable (fboundp (archive-name "chown-entry"))
465-
:help "Change owner of marked files"))
466-
(define-key map [menu-bar operate chgrp]
467-
'(menu-item "Change Group..." archive-chgrp-entry
468-
:enable (fboundp (archive-name "chgrp-entry"))
469-
:help "Change group ownership of marked files"))
470-
(define-key map [menu-bar operate chmod]
471-
'(menu-item "Change Mode..." archive-chmod-entry
472-
:enable (fboundp (archive-name "chmod-entry"))
473-
:help "Change mode (permissions) of marked files"))
474-
(define-key map [menu-bar operate rename]
475-
'(menu-item "Rename to..." archive-rename-entry
476-
:enable (fboundp (archive-name "rename-entry"))
477-
:help "Rename marked files"))
478-
;;(define-key map [menu-bar operate copy]
479-
;; '(menu-item "Copy to..." archive-copy))
480-
(define-key map [menu-bar operate expunge]
481-
'(menu-item "Expunge Marked Files" archive-expunge
482-
:help "Delete all flagged files from archive"))
483-
map))
420+
(define-key map [mouse-2] 'archive-extract)
421+
422+
(define-key map [menu-bar immediate]
423+
(cons "Immediate" (make-sparse-keymap "Immediate")))
424+
(define-key map [menu-bar immediate alternate]
425+
'(menu-item "Alternate Display" archive-alternate-display
426+
:enable (boundp (archive-name "alternate-display"))
427+
:help "Toggle alternate file info display"))
428+
(define-key map [menu-bar immediate view]
429+
'(menu-item "View This File" archive-view
430+
:help "Display file at cursor in View Mode"))
431+
(define-key map [menu-bar immediate display]
432+
'(menu-item "Display in Other Window" archive-display-other-window
433+
:help "Display file at cursor in another window"))
434+
(define-key map [menu-bar immediate find-file-other-window]
435+
'(menu-item "Find in Other Window" archive-extract-other-window
436+
:help "Edit file at cursor in another window"))
437+
(define-key map [menu-bar immediate find-file]
438+
'(menu-item "Find This File" archive-extract
439+
:help "Extract file at cursor and edit it"))
440+
441+
(define-key map [menu-bar mark]
442+
(cons "Mark" (make-sparse-keymap "Mark")))
443+
(define-key map [menu-bar mark unmark-all]
444+
'(menu-item "Unmark All" archive-unmark-all-files
445+
:help "Unmark all marked files"))
446+
(define-key map [menu-bar mark deletion]
447+
'(menu-item "Flag" archive-flag-deleted
448+
:help "Flag file at cursor for deletion"))
449+
(define-key map [menu-bar mark unmark]
450+
'(menu-item "Unflag" archive-unflag
451+
:help "Unmark file at cursor"))
452+
(define-key map [menu-bar mark mark]
453+
'(menu-item "Mark" archive-mark
454+
:help "Mark file at cursor"))
455+
456+
(define-key map [menu-bar operate]
457+
(cons "Operate" (make-sparse-keymap "Operate")))
458+
(define-key map [menu-bar operate chown]
459+
'(menu-item "Change Owner..." archive-chown-entry
460+
:enable (fboundp (archive-name "chown-entry"))
461+
:help "Change owner of marked files"))
462+
(define-key map [menu-bar operate chgrp]
463+
'(menu-item "Change Group..." archive-chgrp-entry
464+
:enable (fboundp (archive-name "chgrp-entry"))
465+
:help "Change group ownership of marked files"))
466+
(define-key map [menu-bar operate chmod]
467+
'(menu-item "Change Mode..." archive-chmod-entry
468+
:enable (fboundp (archive-name "chmod-entry"))
469+
:help "Change mode (permissions) of marked files"))
470+
(define-key map [menu-bar operate rename]
471+
'(menu-item "Rename to..." archive-rename-entry
472+
:enable (fboundp (archive-name "rename-entry"))
473+
:help "Rename marked files"))
474+
;;(define-key map [menu-bar operate copy]
475+
;; '(menu-item "Copy to..." archive-copy))
476+
(define-key map [menu-bar operate expunge]
477+
'(menu-item "Expunge Marked Files" archive-expunge
478+
:help "Delete all flagged files from archive"))
479+
map)
484480
"Local keymap for archive mode listings.")
485481
(defvar archive-file-name-indent nil "Column where file names start.")
486482

@@ -838,13 +834,11 @@ when parsing the archive."
838834
;; Using `concat' here copies the text also, so we can add
839835
;; properties without problems.
840836
(let ((text (concat (aref fil 0) "\n")))
841-
(if (featurep 'xemacs)
842-
() ; out of luck
843-
(add-text-properties
844-
(aref fil 1) (aref fil 2)
845-
'(mouse-face highlight
846-
help-echo "mouse-2: extract this file into a buffer")
847-
text))
837+
(add-text-properties
838+
(aref fil 1) (aref fil 2)
839+
'(mouse-face highlight
840+
help-echo "mouse-2: extract this file into a buffer")
841+
text)
848842
text))
849843
files)))
850844
(setq archive-file-list-end (point-marker)))

0 commit comments

Comments
 (0)