Skip to content

Commit 53fd7a0

Browse files
committed
cosmetic: all packages follow same name convention
Except top-level package xlib we have xlib/extension-name and xlib-demo/demo-name. All package names are uninterned symbols.
1 parent e328497 commit 53fd7a0

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed

clx.asd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
(defclass legacy-file (static-file) ())
3636

37-
(defsystem CLX
37+
(defsystem #:clx
3838
:description "An implementation of the X Window System protocol in Lisp."
3939
:depends-on (#+sbcl sb-bsd-sockets)
4040
:version "0.7.2"

demo/clclock.lisp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
(defpackage "XCLCLOCK"
1+
(defpackage #:xlib-demo/clclock
22
(:use "CL")
33
(:export "CLOCK"))
44

5-
(in-package "XCLCLOCK")
5+
(in-package #:xlib-demo/clclock)
66

77
(defvar *display* (xlib:open-default-display))
88
(defvar *screen* (xlib:display-default-screen *display*))

demo/clipboard.lisp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@
5959
;;; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
6060
;;; DEALINGS IN THE SOFTWARE.
6161

62-
(defpackage "CLIPBOARD"
62+
(defpackage #:xlib-demo/clipboard
6363
(:use "CL" "XLIB")
6464
(:export "MAIN"))
6565

66-
(in-package "CLIPBOARD")
66+
(in-package #:xlib-demo/clipboard)
6767

6868
;;; This is "traditional" XLIB style; I don't really know if it's the
6969
;;; best way -- in developing this program, style of XLIB programming

demo/clx-demos.lisp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
;;; This file should be portable to any valid Common Lisp with CLX -- DEC 88.
77
;;;
88

9-
(defpackage :demos (:use :common-lisp)
9+
(defpackage #:xlib-demo/demos (:use :common-lisp)
1010
(:export do-all-demos demo))
1111

12-
(in-package :demos)
12+
(in-package :xlib-demo/demos)
1313

1414

1515
;;;; Graphic demos wrapper macro.

demo/mandel.lisp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
(defpackage "XMANDEL"
1+
(defpackage #:xlib-demo/mandel
22
(:use "CL")
33
(:export "NEW-WINDOW" "EVENT-LOOP"))
44

5-
(in-package "XMANDEL")
5+
(in-package #:xlib-demo/mandel)
66

77
(defvar *display* (xlib:open-default-display))
88
(defvar *screen* (xlib:display-default-screen *display*))

extensions/dpms.lisp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
;;;; any purpose of the information in this document. This documentation is
1414
;;;; provided ``as is'' without express or implied warranty.
1515

16-
(defpackage :dpms
16+
(defpackage #:xlib/dpms
1717
(:use :common-lisp)
1818
(:import-from :xlib
1919
"DEFINE-EXTENSION"
@@ -36,7 +36,7 @@
3636
"DPMS-FORCE-LEVEL"
3737
"DPMS-INFO"))
3838

39-
(in-package :dpms)
39+
(in-package #:xlib/dpms)
4040

4141
(define-extension "DPMS")
4242

extensions/xinerama.lisp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
;;; This is an implementation of the XINERAMA extension. It does not
1313
;;; include the obsolete PanoramiX calls.
1414

15-
(defpackage "XLIB.XINERAMA"
15+
(defpackage #:xlib/xinerama
1616
(:use "COMMON-LISP" "XLIB")
1717
(:nicknames "XINERAMA")
1818
(:import-from "XLIB"
@@ -33,7 +33,7 @@
3333
"XINERAMA-QUERY-VERSION"
3434
"XINERAMA-IS-ACTIVE"
3535
"XINERAMA-QUERY-SCREENS"))
36-
(in-package "XINERAMA")
36+
(in-package #:xlib/xinerama)
3737

3838
(define-extension "XINERAMA")
3939

extensions/xtest.lisp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
;;; * Implement XTestSetVisualIDOfVisual and XTestDiscard
1111
;;; * Add the missing (declare (type ...
1212

13-
(defpackage :xtest
13+
(defpackage #:xlib/xtest
1414
(:use :common-lisp :xlib)
1515
(:import-from :xlib
1616
#:data
@@ -44,7 +44,7 @@
4444
#:fake-key-event
4545
#:grab-control))
4646

47-
(in-package :xtest)
47+
(in-package #:xlib/xtest)
4848

4949
(define-extension "XTEST")
5050

package.lisp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@
228228
(common-lisp:in-package :common-lisp-user)
229229

230230
#+clx-ansi-common-lisp
231-
(defpackage xlib
231+
(defpackage #:xlib
232232
(:use common-lisp)
233233
(:size 3000)
234234
#+(or kcl ibcl) (:shadow rational)

0 commit comments

Comments
 (0)