Browse Source

Remove the special noutline.el file for XEmacs

The latest XEmacs package release does now contain a modern version of
outline.el, put there by Michael Sperber.

* Makefile: Remove targets related to noutline.el.
* README: Remove the entry for the xemacs directory.
* README_DIST: Remove the entry for the xemacs directory.
* doc/org.texi (Installation): Remove the special installation
instructions for XEmacs.
* lisp/org.el (outline): Remove special code to load noutline.el
for XEmacs.
* xemacs/README: File removed.
* xemacs/noutline.el: File removed.
* xemacs/ps-print-invisible.el: File removed.
Carsten Dominik 9 years ago
parent
commit
190e88cfc9
8 changed files with 0 additions and 1328 deletions
  1. 0 9
      Makefile
  2. 0 6
      README
  3. 0 6
      README_DIST
  4. 0 12
      doc/org.texi
  5. 0 4
      lisp/org.el
  6. 0 15
      xemacs/README
  7. 0 1051
      xemacs/noutline.el
  8. 0 225
      xemacs/ps-print-invisible.el

+ 0 - 9
Makefile

@@ -166,7 +166,6 @@ SHELL = /bin/sh
 
 # Additional distribution files
 DISTFILES_extra=  Makefile request-assign-future.txt contrib
-DISTFILES_xemacs=  xemacs/noutline.el xemacs/ps-print-invisible.el xemacs/README
 
 default: $(ELCFILES) $(ELCBFILES)
 
@@ -205,10 +204,6 @@ install-info: $(INFOFILES)
 install-info-debian: $(INFOFILES)
 	$(INSTALL_INFO) --infodir=$(infodir) $(INFOFILES)
 
-install-noutline: xemacs/noutline.elc
-	if [ ! -d $(lispdir) ]; then $(MKDIR) $(lispdir); else true; fi ;
-	$(CP) xemacs/noutline.el xemacs/noutline.elc $(lispdir)
-
 autoloads: lisp/org-install.el
 
 lisp/org-install.el: $(LISPFILES0) Makefile
@@ -220,8 +215,6 @@ lisp/org-install.el: $(LISPFILES0) Makefile
 		--eval '(save-buffer)'
 	mv org-install.el lisp
 
-xemacs/noutline.elc: xemacs/noutline.el
-
 doc/org: doc/org.texi
 	(cd doc; $(MAKEINFO) --no-split org.texi -o org)
 
@@ -318,7 +311,6 @@ distfile:
 	${MAKE} lisp/org-install.el
 	rm -rf org-$(TAG) org-$(TAG).zip
 	$(MKDIR) org-$(TAG)
-	$(MKDIR) org-$(TAG)/xemacs
 	$(MKDIR) org-$(TAG)/doc
 	$(MKDIR) org-$(TAG)/lisp
 	cp -r $(LISPFILES) org-$(TAG)/lisp
@@ -326,7 +318,6 @@ distfile:
 	cp -r $(DISTFILES_extra) org-$(TAG)/
 	cp -r README_DIST org-$(TAG)/README
 	cp -r ORGWEBPAGE/Changes.org org-$(TAG)/
-	cp -r $(DISTFILES_xemacs) org-$(TAG)/xemacs/
 	zip -r org-$(TAG).zip org-$(TAG)
 	gtar zcvf org-$(TAG).tar.gz org-$(TAG)
 

+ 0 - 6
README

@@ -21,12 +21,6 @@ doc/
     The documentation files.  org.texi is the source of the
     documentation, org.html and org.pdf are formatted versions of it.
 
-xemacs/
-    The xemacs directory contains special code for XEmacs users, in
-    particular a port of the GNU Emacs outline.el to XEmacs.  Org-mode
-    does not work under XEmacs without this file installed.  It did
-    until version 4.37, but no longer.
-
 contrib/
     A directory with third-party additions for Org.  Some really cool
     stuff is in there.

+ 0 - 6
README_DIST

@@ -17,12 +17,6 @@ doc/
     The documentation files.  org.texi is the source of the
     documentation, org.html and org.pdf are formatted versions of it.
 
-xemacs/
-    The xemacs directory contains special code for XEmacs users, in
-    particular a port of the GNU Emacs outline.el to XEmacs.  Org-mode
-    does not work under XEmacs without this file installed.  It did
-    until version 4.37, but no longer.
-
 contrib/
     A directory with third-party additions for Org.  Some really cool
     stuff is in there.

+ 0 - 12
doc/org.texi

@@ -634,18 +634,6 @@ step for this directory:
 (setq load-path (cons "~/path/to/orgdir/contrib/lisp" load-path))
 @end example
 
-@sp 2
-@cartouche
-XEmacs users now need to install the file @file{noutline.el} from
-the @file{xemacs} sub-directory of the Org distribution.  Use the
-command:
-
-@example
-     make install-noutline
-@end example
-@end cartouche
-@sp 2
-
 @noindent Now byte-compile the Lisp files with the shell command:
 
 @example

+ 0 - 4
lisp/org.el

@@ -86,10 +86,6 @@
   (unless (boundp 'diary-fancy-buffer)
     (defvaralias 'diary-fancy-buffer 'fancy-diary-buffer)))
 
-;; For XEmacs, noutline is not yet provided by outline.el, so arrange for
-;; the file noutline.el being loaded.
-(if (featurep 'xemacs) (condition-case nil (require 'noutline)))
-;; We require noutline, which might be provided in outline.el
 (require 'outline) (require 'noutline)
 ;; Other stuff we need.
 (require 'time-date)

+ 0 - 15
xemacs/README

@@ -1,15 +0,0 @@
-This directory contains files that are necessary or at least useful
-companions for Org-mode under XEmacs:
-
-noutline.el
-
-   Greg Chernov's port of the overlay-based implementation of
-   outline-mode.  This is required, and until XEmacs uses this (or
-   another port), you need to install it with Org-mode.  The "Installation"
-   section in the Manual covers also the installation of  this package.
-
-ps-print-invisible.el
-
-   Greg Chernovs modification to ps-print, to honor invisible text
-   properties during printing.  This file is not required for running
-   Org-mode, but it is useful when trying to print partial trees.

File diff suppressed because it is too large
+ 0 - 1051
xemacs/noutline.el


+ 0 - 225
xemacs/ps-print-invisible.el

@@ -1,225 +0,0 @@
-;;; ps-print-invisible.el - addon to ps-print package that deals
-;;  with invisible text printing in xemacs
-
-;; Author: Greg Chernov
-;;
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
-
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;;
-;;; Commentary:
-;; 
-;; Put ps-print-invisible.el on your load path.
-;; (require 'ps-print-invisible)
-;; ps-print-buffer-with-faces will not print invisible parts of the buffer.
-;; Work with invisible extents/text properties only 
-;; (xemacs hideshow and noutline packages). 
-
-(defun ps-generate-postscript-with-faces (from to)
-  ;; Some initialization...
-  (setq ps-current-effect 0)
-
-  ;; Build the reference lists of faces if necessary.
-  (when (or ps-always-build-face-reference
-	    ps-build-face-reference)
-    (message "Collecting face information...")
-    (ps-build-reference-face-lists))
-
-  ;; Black/white printer.
-  (setq ps-black-white-faces-alist nil)
-  (and (eq ps-print-color-p 'black-white)
-       (ps-extend-face-list ps-black-white-faces nil
-			    'ps-black-white-faces-alist))
-
-  ;; Generate some PostScript.
-  (save-restriction
-    (narrow-to-region from to)
-    (ps-print-ensure-fontified from to)
-    (let ((face 'default)
-	  (position to))
-      (cond
-       ((memq ps-print-emacs-type '(xemacs lucid))
-       ;; Build the list of extents...
-       ;;(debug)
-	(let ((a (cons 'dummy nil))
-	      record type extent extent-list
-	      (list-invisible (ps-print-find-invisible-xmas from to)))
-	  (ps-x-map-extents 'ps-mapper nil from to a)
-	  (setq a (sort (cdr a) 'car-less-than-car)
-		extent-list nil)
-	  
-	  ;; Loop through the extents...
-	  (while a
-	    (setq record (car a)
-		  position (car record)
-		  
-		  record (cdr record)
-		  type (car record)
-		  
-		  record (cdr record)
-		  extent (car record))
-	    
-	    ;; Plot up to this record.
-	    ;; XEmacs 19.12: for some reason, we're getting into a
-	    ;; situation in which some of the records have
-	    ;; positions less than 'from'.  Since we've narrowed
-	    ;; the buffer, this'll generate errors.  This is a hack,
-	    ;; but don't call ps-plot-with-face unless from > point-min.
-	    (and (>= from (point-min))
-		 (ps-plot-with-face from (min position (point-max)) face))
-	    
-	    (cond
-	     ((eq type 'push)
-	      (and (or (ps-x-extent-face extent)
-		       (extent-property extent 'invisible))
-		   (setq extent-list (sort (cons extent extent-list)
-					   'ps-extent-sorter))))
-	     
-	     ((eq type 'pull)
-	      (setq extent-list (sort (delq extent extent-list)
-				      'ps-extent-sorter))))
-	    
-	    
-	    (setq face (if extent-list
-			   (let ((prop (extent-property (car extent-list) 'invisible)))
-			     (if (or (and (eq buffer-invisibility-spec t)
-					  (not (null prop)))
-				     (and (consp buffer-invisibility-spec)
-					  (or (memq prop buffer-invisibility-spec)
-					      (assq prop buffer-invisibility-spec))))
-				 'emacs--invisible--face
-			       (ps-x-extent-face (car extent-list))))
-			 'default)
-		  from position
-		  a (cdr a)))))
-
-       ((eq ps-print-emacs-type 'emacs)
-	(let ((property-change from)
-	      (overlay-change from)
-	      (save-buffer-invisibility-spec buffer-invisibility-spec)
-	      (buffer-invisibility-spec nil)
-	      before-string after-string)
-	  (while (< from to)
-	    (and (< property-change to)	; Don't search for property change
-					; unless previous search succeeded.
-		 (setq property-change (next-property-change from nil to)))
-	    (and (< overlay-change to)	; Don't search for overlay change
-					; unless previous search succeeded.
-		 (setq overlay-change (min (ps-e-next-overlay-change from)
-					   to)))
-	    (setq position (min property-change overlay-change)
-		  before-string nil
-		  after-string nil)
-	    ;; The code below is not quite correct,
-	    ;; because a non-nil overlay invisible property
-	    ;; which is inactive according to the current value
-	    ;; of buffer-invisibility-spec nonetheless overrides
-	    ;; a face text property.
-	    (setq face
-		  (cond ((let ((prop (get-text-property from 'invisible)))
-			   ;; Decide whether this invisible property
-			   ;; really makes the text invisible.
-			   (if (eq save-buffer-invisibility-spec t)
-			       (not (null prop))
-			     (or (memq prop save-buffer-invisibility-spec)
-				 (assq prop save-buffer-invisibility-spec))))
-			 'emacs--invisible--face)
-			((get-text-property from 'face))
-			(t 'default)))
-	    (let ((overlays (ps-e-overlays-at from))
-		  (face-priority -1))	; text-property
-	      (while (and overlays
-			  (not (eq face 'emacs--invisible--face)))
-		(let* ((overlay (car overlays))
-		       (overlay-invisible
-			(ps-e-overlay-get overlay 'invisible))
-		       (overlay-priority
-			(or (ps-e-overlay-get overlay 'priority) 0)))
-		  (and (> overlay-priority face-priority)
-		       (setq before-string
-			     (or (ps-e-overlay-get overlay 'before-string)
-				 before-string)
-			     after-string
-			     (or (and (<= (ps-e-overlay-end overlay) position)
-				      (ps-e-overlay-get overlay 'after-string))
-				 after-string)
-			     face-priority overlay-priority
-			     face
-			     (cond
-			      ((if (eq save-buffer-invisibility-spec t)
-				   (not (null overlay-invisible))
-				 (or (memq overlay-invisible
-					   save-buffer-invisibility-spec)
-				     (assq overlay-invisible
-					   save-buffer-invisibility-spec)))
-			       'emacs--invisible--face)
-			      ((ps-e-overlay-get overlay 'face))
-			      (t face)
-			      ))))
-		(setq overlays (cdr overlays))))
-	    ;; Plot up to this record.
-	    (and before-string
-		 (ps-plot-string before-string))
-	    (ps-plot-with-face from position face)
-	    (and after-string
-		 (ps-plot-string after-string))
-	    (setq from position)))))
-      (ps-plot-with-face from to face))))
-
-
-(defun ps-print-find-invisible-xmas (from to)
-  (let ((list nil))
-    (map-extents '(lambda (ex ignored)
-		    (let ((prop (extent-property ex 'invisible)))
-		      (if (or (and (eq buffer-invisibility-spec t)
-				   (not (null prop)))
-			      (or (memq prop buffer-invisibility-spec)
-				  (assq prop buffer-invisibility-spec)))
-			  (setq list (cons (list 
-					      (extent-start-position ex)
-					      (extent-end-position ex))
-					     list))))
-		    nil)
-		 (current-buffer)
-		 from to nil 'start-and-end-in-region 'invisible)
-    (reverse list)))
-
-
-(defun ps-mapper (extent list)
-  ;;(debug)
-  (let ((beg (ps-x-extent-start-position extent))
-	(end (ps-x-extent-end-position extent))
-	(inv-lst list-invisible)
-	(found nil))
-    (while (and inv-lst
-		(not found))
-      (let ((inv-beg (caar inv-lst))
-	    (inv-end (cadar inv-lst)))
-	(if (and (>= beg inv-beg)
-		 (<= end inv-end)
-		 (not (extent-property extent 'invisible)))
-	    (setq found t))
-	(setq inv-lst (cdr inv-lst))))
-    (if (not found) 
-	(nconc list
-	       (list (list beg 'push extent)
-		     (list end 'pull extent)))))
-      nil)
-
-
-(provide 'ps-print-invisible)
-
-
-;;; ps-print-invisible.el ends here