Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 425258 | Differences between
and this patch

Collapse All | Expand All

(-)elscreen.el.orig (-2 / +50 lines)
Lines 1691-1696 Use \\[toggle-read-only] to permit editi Link Here
1691
                  ("-e"                . elscreen-command-line-funcall))))
1691
                  ("-e"                . elscreen-command-line-funcall))))
1692
1692
1693
  (static-when elscreen-on-emacs
1693
  (static-when elscreen-on-emacs
1694
    (cond
1695
     ;  -----------------------
1696
     ((< emacs-major-version 23)	; emacs22 or prior to
1697
	(progn
1694
    (defun elscreen-e21-command-line ()
1698
    (defun elscreen-e21-command-line ()
1695
      (when (string-match "\\`-" argi)
1699
      (when (string-match "\\`-" argi)
1696
        (error "Unknown option `%s'" argi))
1700
        (error "Unknown option `%s'" argi))
Lines 1703-1713 Use \\[toggle-read-only] to permit editi Link Here
1703
        (elscreen-command-line-find-file file file-count line column))
1707
        (elscreen-command-line-find-file file file-count line column))
1704
      (setq line 0)
1708
      (setq line 0)
1705
      (setq column 0)
1709
      (setq column 0)
1706
      t)
1710
      t) ; defun
1707
1711
1708
    (add-hook 'after-init-hook (lambda ()
1712
    (add-hook 'after-init-hook (lambda ()
1709
                                 (add-to-list 'command-line-functions
1713
                                 (add-to-list 'command-line-functions
1710
                                              'elscreen-e21-command-line t))))
1714
                                              'elscreen-e21-command-line t)))) ; progn
1715
    )  ; else
1716
     ;  -----------------------
1717
    ((= emacs-major-version 23)	; emacs23
1718
      (progn
1719
    (defun elscreen-e23-command-line ()
1720
      (when (string-match "\\`-" argi)
1721
        (error "Unknown option `%s'" argi))
1722
      (setq file-count (1+ file-count))
1723
      (setq inhibit-startup-buffer-menu t)
1724
      (let* ((file
1725
              (expand-file-name
1726
               (command-line-normalize-file-name orig-argi)
1727
               cl1-dir)))
1728
        (elscreen-command-line-find-file file file-count cl1-line cl1-column))
1729
      (setq cl1-line 0)
1730
      (setq cl1-column 0)
1731
      t) ; defun
1732
    
1733
    (add-hook 'after-init-hook (lambda ()
1734
                                 (add-to-list 'command-line-functions
1735
                                              'elscreen-e23-command-line t)))) ; progn
1736
      ) ; else
1737
     ;  -----------------------
1738
    ((> emacs-major-version 23)	; emacs24 or later
1739
      (progn
1740
    (defun elscreen-e24-command-line ()
1741
      (when (string-match "\\`-" cl1-argi)
1742
        (error "Unknown option `%s'" cl1-argi))
1743
      (setq file-count (1+ file-count))
1744
      (setq inhibit-startup-buffer-menu t)
1745
      (let* ((file
1746
              (expand-file-name
1747
               (command-line-normalize-file-name orig-argi)
1748
               cl1-dir)))
1749
        (elscreen-command-line-find-file file file-count cl1-line cl1-column))
1750
      (setq cl1-line 0)
1751
      (setq cl1-column 0)
1752
      t) ; defun
1753
    
1754
    (add-hook 'after-init-hook (lambda ()
1755
                                 (add-to-list 'command-line-functions
1756
                                              'elscreen-e24-command-line t)))) ; progn
1757
      )
1758
      )) ; endif (emacs22 or prior to)
1711
1759
1712
  (static-when elscreen-on-xemacs
1760
  (static-when elscreen-on-xemacs
1713
    (defadvice command-line-1 (around elscreen-xmas-command-line-1 activate)
1761
    (defadvice command-line-1 (around elscreen-xmas-command-line-1 activate)

Return to bug 425258