Skip to content

Commit

Permalink
- Removed Emacs 20.X support completely
Browse files Browse the repository at this point in the history
-�´Set Copyright to 2005
  • Loading branch information
berndl committed Feb 28, 2005
1 parent 160dda9 commit f88254a
Show file tree
Hide file tree
Showing 33 changed files with 404 additions and 460 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This Makefile byte-compiles the ECB lisp files and generates online-help.

# Copyright (C) 2000 - 2003 Jesper Nordenberg,
# Copyright (C) 2000 - 2005 Jesper Nordenberg,
# Klaus Berndl,
# Kevin A. Burton,
# Free Software Foundation, Inc.
Expand Down
12 changes: 9 additions & 3 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
* Changes for ECB version 2.32beta1

** Support for (X)Emacs < 21 has been officialy removed.
ECB requires now (X)Emacs >= 21. ECB stops activation with an appropriate
error-message when (X)Emacs < 21 is detected.

** New native ECB-display interactor for the semantic-analyzer
There is a new tree-buffer ECB-analyse which displays the tags and
informations of the semanic-analyzer in a smooth way. There are already
Expand All @@ -8,7 +12,6 @@
`ecb-create-new-layout' or via a elisp-rogrammed new layout).

TODO: + adding new section in the texi-manual
+ enhance ecb-create-layout.el
+ fixes all docstring of ecb-analyse.el

** Renamed options or options with new type
Expand Down Expand Up @@ -41,7 +44,7 @@

** Fixed Bugs

*** Handles not anymore existing files in the stealthy tasks (TODO!!!!!)
*** Handles not anymore existing files in the stealthy tasks

*** Fixed a bug when `ecb-process-non-semantic-files' is set to nil.
This bug only occurs with XEmacs. As a side effect of this fix now the
Expand All @@ -53,7 +56,10 @@

*** Fixed a bug in displaying semantic-tags which have plain-string members
E.g. parsing `defstruct' has failed in previous ECB-version cause of this
bug.
bug.

*** Fixed a bug when Emacs is started with -q so Emacs could not determine the
`custom-file'. This case is correctly handled now.



Expand Down
2 changes: 1 addition & 1 deletion ecb-analyse.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; ecb-analyse.el --- ECB analysis display interactor

;;; Copyright (C) 2004 Klaus Berndl,
;;; Copyright (C) 2004 - 2005 Klaus Berndl

;; Author: Klaus Berndl <[email protected]>
;; Maintainer: Klaus Berndl <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion ecb-autogen.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; ecb-autogen.el --- Auto load statement generator

;; Copyright (C) 2000 - 2003 Jesper Nordenberg,
;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
;; Klaus Berndl,
;; Kevin A. Burton,
;; Free Software Foundation, Inc.
Expand Down
2 changes: 1 addition & 1 deletion ecb-common-browser.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; ecb-common-browser.el --- common browsing stuff for Emacs

;; Copyright (C) 2000 - 2004 Jesper Nordenberg,
;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
;; Klaus Berndl,
;; Kevin A. Burton,
;; Free Software Foundation, Inc.
Expand Down
2 changes: 1 addition & 1 deletion ecb-compatibility.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; ecb-compatibility.el --- ECB-compatibility for other packages

;; Copyright (C) 2000 - 2003 Jesper Nordenberg,
;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
;; Klaus Berndl,
;; Kevin A. Burton,
;; Free Software Foundation, Inc.
Expand Down
2 changes: 1 addition & 1 deletion ecb-compilation.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; ecb-compilation.el --- code for buffers displayed in compile-window

;; Copyright (C) 2000 - 2003 Jesper Nordenberg,
;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
;; Klaus Berndl,
;; Kevin A. Burton,
;; Free Software Foundation, Inc.
Expand Down
102 changes: 45 additions & 57 deletions ecb-create-layout.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; ecb-create-layout.el --- creating new layouts

;; Copyright (C) 2000 - 2003 Jesper Nordenberg,
;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
;; Klaus Berndl,
;; Kevin A. Burton,
;; Free Software Foundation, Inc.
Expand Down Expand Up @@ -84,7 +84,7 @@
(defconst ecb-create-layout-buf-prefix " *ECB-LC-")
(defconst ecb-create-layout-frame-name "Creation of a new ECB-layout")
(defconst ecb-create-layout-all-buf-types
'("directories" "history" "methods" "sources" "speedbar"))
'("directories" "history" "methods" "sources" "speedbar" "analyse"))

(defconst ecb-create-layout-help-text-left-right
"
Expand All @@ -105,14 +105,13 @@
- How to split: \"at-point\", \"half\" or
\"other\" (i.e. you can specify any fraction
between 0.1 and 0.9)
- Which type (\"directories\", \"sources\",
\"methods\", \"history\", \"speedbar\") the
current window should be.
- Which type the current window should be
\(see description of C-t below).
C-u: Unsplit, ie. delete current window
C-t: Give the current window a built-in type
(\"directories\", \"sources\", \"methods\",
\"history\", \"speedbar\") or any arbitrary user-
defined type (\"other\"). See the Online-manual!
\"history\" etc.) or any arbitrary user-defined
type (\"other\"). See the Online-manual!
C-c: Cancel layout creation. This does not save the
layout. Deletes this frame.
Expand Down Expand Up @@ -140,11 +139,10 @@
- If \"vertical\" or \"horizontal\" split
- How to split: \"at-point\", \"half\" or \"other\" (i.e. you can specify any
fraction between 0.1 and 0.9)
- Which type (\"directories\", \"sources\", \"methods\", \"history\", \"speedbar\")
the current window should be.
- Which type the current window should be \(see description of C-t below).
C-u: Unsplit, ie. delete current window
C-t: Give the current window a built-in type (\"directories\", \"sources\", \"methods\",
\"history\", \"speedbar\") or any arbitrary user-defined type (\"other\").
\"history\" etc.) or any arbitrary user-defined type (\"other\").
C-c: Cancel layout creation. This does not save the layout. Deletes this frame.
C-q: Save current defined layout and quit the layout creation. You will be asked for a
Expand All @@ -157,9 +155,9 @@
(defconst ecb-create-layout-file-header
"
;; Copyright (C) 2001 Jesper Nordenberg
;; Copyright (C) 2001 Free Software Foundation, Inc.
;; Copyright (C) 2001 Klaus Berndl <[email protected]>
;; Copyright (C) 2001 - 2005 Jesper Nordenberg
;; Copyright (C) 2001 - 2005 Free Software Foundation, Inc.
;; Copyright (C) 2001 - 2005 Klaus Berndl <[email protected]>
;; Author: Klaus Berndl <[email protected]>
;; Maintainer: Klaus Berndl <[email protected]>
Expand Down Expand Up @@ -272,8 +270,8 @@ DELETE-FRAME is not nil then the new created frame will be deleted and the
(setq minor-mode-map-alist
ecb-create-layout-old-minor-mode-map-alist))
;; restore horiz. scrolling
(if ecb-running-emacs-21
(setq automatic-hscrolling ecb-create-layout-old-hscroll))
(unless ecb-running-xemacs
(setq automatic-hscrolling ecb-create-layout-old-hscroll))
;; for XEmacs restore these maps
(if ecb-running-xemacs
(progn
Expand Down Expand Up @@ -705,47 +703,37 @@ never selects the edit-window."

(defun ecb-create-layout-make-frame ()
"Create a new frame for the layout creation process and return it."
(cond (ecb-running-xemacs
(make-frame `((name . ,ecb-create-layout-frame-name)
(minibuffer . t)
(user-position . t)
(width . ,ecb-create-layout-frame-width)
(height . ,ecb-create-layout-frame-height)
(default-toolbar-visible-p . nil)
(left-toolbar-visible-p . nil)
(right-toolbar-visible-p . nil)
(top-toolbar-visible-p . nil)
(bottom-toolbar-visible-p . nil)
(default-gutter-visible-p . nil)
(left-gutter-visible-p . nil)
(right-gutter-visible-p . nil)
(top-gutter-visible-p . nil)
(bottom-gutter-visible-p . nil)
(has-modeline-p . t)
(use-left-overflow . nil)
(vertical-scrollbar-visible-p . nil)
(horizontal-scrollbar-visible-p . nil)
(use-right-overflow . nil)
(menubar-visible-p . nil))))
(ecb-running-emacs-21
(make-frame `((name . ,ecb-create-layout-frame-name)
(minibuffer . t)
(user-position . t)
(width . ,ecb-create-layout-frame-width)
(height . ,ecb-create-layout-frame-height)
(vertical-scroll-bars . nil)
(horizontal-scroll-bars . nil)
(tool-bar-lines . 0)
(menu-bar-lines . 0))))
(t ;; Emacs 20
(make-frame `((name . ,ecb-create-layout-frame-name)
(minibuffer . t)
(user-position . t)
(width . ,ecb-create-layout-frame-width)
(height . ,ecb-create-layout-frame-height)
(vertical-scroll-bars . nil)
(menu-bar-lines . 0))))))

(if ecb-running-xemacs
(make-frame `((name . ,ecb-create-layout-frame-name)
(minibuffer . t)
(user-position . t)
(width . ,ecb-create-layout-frame-width)
(height . ,ecb-create-layout-frame-height)
(default-toolbar-visible-p . nil)
(left-toolbar-visible-p . nil)
(right-toolbar-visible-p . nil)
(top-toolbar-visible-p . nil)
(bottom-toolbar-visible-p . nil)
(default-gutter-visible-p . nil)
(left-gutter-visible-p . nil)
(right-gutter-visible-p . nil)
(top-gutter-visible-p . nil)
(bottom-gutter-visible-p . nil)
(has-modeline-p . t)
(use-left-overflow . nil)
(vertical-scrollbar-visible-p . nil)
(horizontal-scrollbar-visible-p . nil)
(use-right-overflow . nil)
(menubar-visible-p . nil)))
(make-frame `((name . ,ecb-create-layout-frame-name)
(minibuffer . t)
(user-position . t)
(width . ,ecb-create-layout-frame-width)
(height . ,ecb-create-layout-frame-height)
(vertical-scroll-bars . nil)
(horizontal-scroll-bars . nil)
(tool-bar-lines . 0)
(menu-bar-lines . 0)))))

;; TODO: Klaus Berndl <[email protected]>: Wir müssen ev. ECB vorher
;; deaktivieren, da sonst ein 2. ECB-menu entsteht. Beim C-c oder C-q eben
Expand Down Expand Up @@ -783,7 +771,7 @@ never selects the edit-window."
(setq minor-mode-map-alist nil)

;; horiz. scrolling
(when ecb-running-emacs-21
(unless ecb-running-xemacs
(setq ecb-create-layout-old-hscroll automatic-hscrolling)
(setq automatic-hscrolling nil))

Expand Down
2 changes: 1 addition & 1 deletion ecb-cycle.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; ecb-cycle.el --- cycle buffers through ecb windows.

;; Copyright (C) 2000 - 2003 Jesper Nordenberg,
;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
;; Klaus Berndl,
;; Kevin A. Burton,
;; Free Software Foundation, Inc.
Expand Down
2 changes: 1 addition & 1 deletion ecb-eshell.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; ecb-eshell.el --- eshell integration for the ECB.

;; Copyright (C) 2000 - 2003 Jesper Nordenberg,
;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
;; Klaus Berndl,
;; Kevin A. Burton,
;; Free Software Foundation, Inc.
Expand Down
2 changes: 1 addition & 1 deletion ecb-examples.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; ecb-examples.el --- examples for using ECB with Elisp

;; Copyright (C) 2000 - 2003 Jesper Nordenberg,
;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
;; Klaus Berndl,
;; Kevin A. Burton,
;; Free Software Foundation, Inc.
Expand Down
26 changes: 13 additions & 13 deletions ecb-face.el
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
;;; ecb-face.el --- all face-options of ECB

;; Copyright (C) 2000 - 2003 Jesper Nordenberg,
;; Copyright (C) 2000 - 2005 Jesper Nordenberg,
;; Klaus Berndl,
;; Kevin A. Burton,
;; Free Software Foundation, Inc.
Expand Down Expand Up @@ -73,35 +73,35 @@ The parameters are set for the following display-types:
FG-DARK-COL, BG-DARK-COL
- t: HEIGHT, BOLD-P, ITALIC-P, INHERIT, FG-REST, BG-REST, REVERSE-VIDEO."
`(list (list '((class color) (background light))
(append (if (and ,height ecb-running-emacs-21) (list :height ,height))
(if ,bold-p (if ecb-running-emacs-21
(append (if (and ,height (not ecb-running-xemacs)) (list :height ,height))
(if ,bold-p (if (not ecb-running-xemacs)
(list :weight 'bold)
(list :bold t)))
(if ,italic-p (if ecb-running-emacs-21
(if ,italic-p (if (not ecb-running-xemacs)
(list :slant 'italic)
(list :italic t)))
(if (and ,inherit ecb-running-emacs-21) (list :inherit ,inherit))
(if (and ,inherit (not ecb-running-xemacs)) (list :inherit ,inherit))
(if ,fg-light-col (list :foreground ,fg-light-col))
(if ,bg-light-col (list :background ,bg-light-col))))
(list '((class color) (background dark))
(append (if (and ,height ecb-running-emacs-21) (list :height ,height))
(if ,bold-p (if ecb-running-emacs-21
(append (if (and ,height (not ecb-running-xemacs)) (list :height ,height))
(if ,bold-p (if (not ecb-running-xemacs)
(list :weight 'bold)
(list :bold t)))
(if ,italic-p (if ecb-running-emacs-21
(if ,italic-p (if (not ecb-running-xemacs)
(list :slant 'italic)
(list :italic t)))
(if (and ,inherit ecb-running-emacs-21) (list :inherit ,inherit))
(if (and ,inherit (not ecb-running-xemacs)) (list :inherit ,inherit))
(if ,fg-dark-col (list :foreground ,fg-dark-col))
(if ,bg-dark-col (list :background ,bg-dark-col))))
(list 't (append (if (and ,height ecb-running-emacs-21) (list :height ,height))
(if ,bold-p (if ecb-running-emacs-21
(list 't (append (if (and ,height (not ecb-running-xemacs)) (list :height ,height))
(if ,bold-p (if (not ecb-running-xemacs)
(list :weight 'bold)
(list :bold t)))
(if ,italic-p (if ecb-running-emacs-21
(if ,italic-p (if (not ecb-running-xemacs)
(list :slant 'italic)
(list :italic t)))
(if (and ,inherit ecb-running-emacs-21) (list :inherit ,inherit))
(if (and ,inherit (not ecb-running-xemacs)) (list :inherit ,inherit))
(if ,fg-rest (list :foreground ,fg-rest))
(if ,bg-rest (list :foreground ,bg-rest))
(if ,reverse-video-p (list :reverse-video t))))))
Expand Down
Loading

0 comments on commit f88254a

Please sign in to comment.