Changeset 3928

Timestamp:

10/23/05 12:09:52 (3 years ago)

Author:

fujii

Message:

Use a built-in version of x-parse-geometry() instead of lisp version.

* international/meadow.el (x-parse-geometry): Removed. Built-in
function is used instead.

Files:

• trunk/lisp/ChangeLog.Meadow (modified) (1 diff)
• trunk/lisp/international/meadow.el (modified) (1 diff)

trunk/lisp/ChangeLog.Meadow

@@ +1 @@
+2005-10-23  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
+
+        * international/meadow.el (x-parse-geometry): Removed. Built-in
+        function is used instead.
+
-2005-10-21  Masayuki FUJII  <boochang@m4.kcn.ne.jp>
-

trunk/lisp/international/meadow.el

@@ -214 +214 @@
-
-(defalias 'x-list-fonts 'w32-list-fonts)
-
-;;
-;; Section: X geometry (-g option)
-;;
-
-(defun x-parse-geometry (str)
-  (let* ((size-regexp "\\([0-9]+\\)?\\(?:[xX]\\([0-9]+\\)\\)?")
-         (location-regexp "\\([+\\-][+\\-]?[0-9]+\\)")
-         (func (lambda (x)
-                 (cond ((null x) nil)
-                       ((= (aref x 0) ?+)
-                        (list '+ (string-to-number
-                                  (substring x 1))))
-                       ((= (aref x 0) ?-)
-                        (list '- (string-to-number
-                                  (substring x 1))))
-                       (t nil))))
-         location-x location-y size-x size-y result)
-    (if (string-match "^=?" str)
-        (setq str (substring str (match-end 0))))
-    (if (string-match
-         (concat "^" size-regexp)
-         str)
-        (setq size-x (and (match-string 1 str)
-                          (string-to-number (match-string 1 str)))
-              size-y (and (match-string 2 str)
-                          (string-to-number (match-string 2 str)))
-              str (substring str (match-end 0))))
-    (if (string-match
-         (concat "^" location-regexp "\\(" location-regexp "\\)?")
-         str)
-        (setq location-x (match-string 1 str)
-              location-y (match-string 2 str)
-              location-x (funcall func location-x)
-              location-y (funcall func location-y)))
-    (if location-x
-        (setq result (cons (cons 'left location-x) result)))
-    (if location-y
-        (setq result (cons (cons 'top location-y) result)))
-    (if size-x
-        (setq result (cons (cons 'width size-x) result)))
-    (if size-y
-        (setq result (cons (cons 'height size-y) result)))
-    result))
-
-;;