[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/cvs-status.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/cvs-status.el [emacs-unicode-2] |
Date: |
Mon, 28 Jun 2004 04:54:30 -0400 |
Index: emacs/lisp/cvs-status.el
diff -c emacs/lisp/cvs-status.el:1.14.6.1 emacs/lisp/cvs-status.el:1.14.6.2
*** emacs/lisp/cvs-status.el:1.14.6.1 Fri Apr 16 12:49:48 2004
--- emacs/lisp/cvs-status.el Mon Jun 28 07:28:28 2004
***************
*** 1,4 ****
! ;;; cvs-status.el --- major mode for browsing `cvs status' output
;; Copyright (C) 1999, 2000, 03, 2004 Free Software Foundation, Inc.
--- 1,4 ----
! ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding:
utf-8 -*-
;; Copyright (C) 1999, 2000, 03, 2004 Free Software Foundation, Inc.
***************
*** 277,286 ****
(cvs-tree-merge (cdr tree1) (cdr tree2))))))
((> l1 l2)
(cvs-tree-merge
! (list (cons (cvs-tag-make (cvs-butlast vl1)) tree1)) tree2))
((< l1 l2)
(cvs-tree-merge
! tree1 (list (cons (cvs-tag-make (cvs-butlast vl2)) tree2)))))))))
(defun cvs-tag-make-tag (tag)
(let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\."))))
--- 277,286 ----
(cvs-tree-merge (cdr tree1) (cdr tree2))))))
((> l1 l2)
(cvs-tree-merge
! (list (cons (cvs-tag-make (butlast vl1)) tree1)) tree2))
((< l1 l2)
(cvs-tree-merge
! tree1 (list (cons (cvs-tag-make (butlast vl2)) tree2)))))))))
(defun cvs-tag-make-tag (tag)
(let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\."))))
***************
*** 293,299 ****
(lambda (tag)
(let ((tag (cvs-tag-make-tag tag)))
(list (if (not (eq (cvs-tag->type tag) 'branch)) tag
! (list (cvs-tag-make (cvs-butlast (cvs-tag->vlist tag)))
tag)))))
tags)))
(while (cdr tags)
--- 293,299 ----
(lambda (tag)
(let ((tag (cvs-tag-make-tag tag)))
(list (if (not (eq (cvs-tag->type tag) 'branch)) tag
! (list (cvs-tag-make (butlast (cvs-tag->vlist tag)))
tag)))))
tags)))
(while (cdr tags)
***************
*** 384,406 ****
;;;; CVSTree-style trees
;;;;
! (defvar cvs-tree-use-jisx0208
! (and (char-displayable-p (make-char 'japanese-jisx0208 40 44)) t)
"*Non-nil if we should use the graphical glyphs from `japanese-jisx0208'.
Otherwise, default to ASCII chars like +, - and |.")
(defconst cvs-tree-char-space
! (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 33 33) " "))
(defconst cvs-tree-char-hbar
! (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 44) "--"))
(defconst cvs-tree-char-vbar
! (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 45) "| "))
(defconst cvs-tree-char-branch
! (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 50) "+-"))
(defconst cvs-tree-char-eob ;end of branch
! (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 49) "`-"))
(defconst cvs-tree-char-bob ;beginning of branch
! (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 51) "+-"))
(defun cvs-tag-lessp (tag1 tag2)
(eq (cvs-tag-compare tag1 tag2) 'more2))
--- 384,428 ----
;;;; CVSTree-style trees
;;;;
! (defvar cvs-tree-use-jisx0208 nil) ;Old compat var.
! (defvar cvs-tree-use-charset
! (cond
! (cvs-tree-use-jisx0208 'jisx0208)
! ((char-displayable-p ?â) 'unicode)
! ((char-displayable-p (make-char 'japanese-jisx0208 40 44)) 'jisx0208))
"*Non-nil if we should use the graphical glyphs from `japanese-jisx0208'.
Otherwise, default to ASCII chars like +, - and |.")
(defconst cvs-tree-char-space
! (case cvs-tree-use-charset
! (jisx0208 (make-char 'japanese-jisx0208 33 33))
! (unicode " ")
! (t " ")))
(defconst cvs-tree-char-hbar
! (case cvs-tree-use-charset
! (jisx0208 (make-char 'japanese-jisx0208 40 44))
! (unicode "â")
! (t "--")))
(defconst cvs-tree-char-vbar
! (case cvs-tree-use-charset
! (jisx0208 (make-char 'japanese-jisx0208 40 45))
! (unicode "â")
! (t "| ")))
(defconst cvs-tree-char-branch
! (case cvs-tree-use-charset
! (jisx0208 (make-char 'japanese-jisx0208 40 50))
! (unicode "â£")
! (t "+-")))
(defconst cvs-tree-char-eob ;end of branch
! (case cvs-tree-use-charset
! (jisx0208 (make-char 'japanese-jisx0208 40 49))
! (unicode "â")
! (t "`-")))
(defconst cvs-tree-char-bob ;beginning of branch
! (case cvs-tree-use-charset
! (jisx0208 (make-char 'japanese-jisx0208 40 51))
! (unicode "â³")
! (t "+-")))
(defun cvs-tag-lessp (tag1 tag2)
(eq (cvs-tag-compare tag1 tag2) 'more2))
***************
*** 411,417 ****
"Look for a list of tags, and replace it with a tree.
Optional prefix ARG chooses between two representations."
(interactive "P")
! (when (and cvs-tree-use-jisx0208
(not enable-multibyte-characters))
;; We need to convert the buffer from unibyte to multibyte
;; since we'll use multibyte chars for the tree.
--- 433,439 ----
"Look for a list of tags, and replace it with a tree.
Optional prefix ARG chooses between two representations."
(interactive "P")
! (when (and cvs-tree-use-charset
(not enable-multibyte-characters))
;; We need to convert the buffer from unibyte to multibyte
;; since we'll use multibyte chars for the tree.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/cvs-status.el [emacs-unicode-2],
Miles Bader <=